Commit Graph

470 Commits

Author SHA1 Message Date
730ff3dcbb Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-01-07 10:29:15 +08:00
d259734f71 修改 2023-01-07 10:29:10 +08:00
fd55d71261 代码更新 2023-01-06 18:26:47 +08:00
8eb2294792 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-01-06 14:32:53 +08:00
2cda82fa09 修改 2023-01-06 14:32:48 +08:00
zhangzhiqiang
e05823a488 fix:重置密码问题 2023-01-06 13:53:39 +08:00
acb1d1074a 代码更新 2023-01-05 17:02:14 +08:00
2856f266bd 代码更新 2023-01-04 18:15:24 +08:00
6c8cffb8b7 修改 2023-01-04 18:11:52 +08:00
9633fc3458 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-01-04 17:41:54 +08:00
79bccb4f63 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-01-04 17:41:25 +08:00
aaeae75f52 代码更新 2023-01-04 17:41:21 +08:00
5fe2cbe618 修改 2023-01-04 17:41:19 +08:00
zhangzhiqiang
084bbe977e fix:个人中心修改密码 2023-01-04 17:06:26 +08:00
zhangzhiqiang
cac6dc2a04 Merge remote-tracking branch 'origin/master' 2023-01-04 17:05:47 +08:00
zhangzhiqiang
292635cea1 fix:个人中心页面修改密码 2023-01-04 17:05:39 +08:00
d66a7bbfa8 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/modules/system/wql/sys.xls
2023-01-04 15:15:36 +08:00
18b80418e6 修改 2023-01-04 15:14:43 +08:00
dda6e6d464 代码更新 2023-01-04 14:55:31 +08:00
zhangzhiqiang
1e66a048f9 fix:修改sys.xls 2023-01-04 14:51:08 +08:00
37ad356ebf 代码更新 2023-01-04 13:21:28 +08:00
f9820e2d96 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2023-01-04 13:20:55 +08:00
59585c2f4d 代码合并 2023-01-04 13:20:45 +08:00
zhangzhiqiang
0c280d76fb Merge remote-tracking branch 'origin/master' 2023-01-04 11:49:00 +08:00
zhangzhiqiang
da0518ce2f mdf:sys_dict sql 2023-01-04 11:48:39 +08:00
1c3b5c19a4 修改 2023-01-03 09:48:21 +08:00
zhangzhiqiang
e263639d42 add:添加日志 2022-12-30 18:13:49 +08:00
zhangzhiqiang
6c09f8a94b 手持登入token前缀修改 2022-12-30 16:59:49 +08:00
zhangzhiqiang
390066178d add:生产环境日志输出控制台 2022-12-30 16:35:22 +08:00
zhangzhiqiang
a130fc0f62 启动类不添加@Tran 2022-12-30 15:47:36 +08:00
zhangzhiqiang
fe11c0acc4 mdf:实现类加@Transactional 2022-12-30 15:20:55 +08:00
zhangzhiqiang
a51593a415 MDF:usernick_name->person_name 2022-12-30 14:34:59 +08:00
zhangzhiqiang
4d144a842d dev环境redis修改 2022-12-30 14:07:01 +08:00
zhangzhiqiang
cf871c8788 tianjia 2022-12-30 14:03:34 +08:00
zhangzhiqiang
0415f8a10e 定时任务及loki 2022-12-30 13:56:43 +08:00
6af24f299a Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_test 2022-12-30 10:21:01 +08:00
2294282665 日志参数 2022-12-30 10:17:29 +08:00
3426e572da Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2022-12-30 10:16:51 +08:00
a34bb6cb9e 修改 2022-12-30 10:16:46 +08:00
zhangzhiqiang
d540fdfa04 同步sql 2022-12-30 09:27:57 +08:00
zhangzhiqiang
fc0e423de2 同步sql 2022-12-30 09:12:00 +08:00
zhangzhiqiang
328b518429 mdf:个人中心页面 2022-12-30 09:01:36 +08:00
88837d5972 Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228 2022-12-30 08:57:54 +08:00
829b5f2c57 登录跳转 2022-12-30 08:57:42 +08:00
zhangzhiqiang
b9f28c2012 同步sql 2022-12-30 08:53:38 +08:00
zhangzhiqiang
3f1fdd74ee Merge remote-tracking branch 'origin/feature/sso-server-merge-1228' into feature/sso-server-merge-1228 2022-12-29 18:01:40 +08:00
zhangzhiqiang
6d4321d647 add:分页插件 2022-12-29 18:01:33 +08:00
911e9f73c3 分页 2022-12-29 17:50:48 +08:00
cb9918adb9 Merge branch 'feature/sso-server-merge-1228' of http://121.40.234.130:8899/root/lanzhouhailiang_one into feature/sso-server-merge-1228 2022-12-29 17:43:24 +08:00
4b7a383fa0 mybatis配置文件 2022-12-29 17:43:13 +08:00