Commit Graph

251 Commits

Author SHA1 Message Date
liang.cheng 82b09416bb Merge pull request '人员卡片' (#23) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/23
2022-11-14 19:21:29 +08:00
Chengliang aa77770e09 人员卡片 2022-11-14 19:20:18 +08:00
黎永顺 9eeadb416e 栏目自定义页面接口联调 2022-11-14 10:42:44 +08:00
黎永顺 6a6587bea7 Merge remote-tracking branch 'origin/dev' into dev 2022-11-11 17:09:33 +08:00
黎永顺 4318dc9830 栏目权限新增自定义项 2022-11-11 17:09:18 +08:00
liang.cheng 17bd109269 Merge pull request '导入设置' (#20) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/20
2022-11-11 17:07:10 +08:00
Chengliang 25dd4020ca 导入设置 2022-11-11 17:05:06 +08:00
liang.cheng 1cdf8f6487 Merge pull request '文件路径修改' (#19) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/19
2022-11-10 18:53:36 +08:00
Chengliang bd5db8d4c0 文件路径修改 2022-11-10 18:50:45 +08:00
liang.cheng 5b091c5e82 Merge pull request '其它导入' (#17) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/17
2022-11-10 16:13:21 +08:00
Chengliang 3dbcad0bd0 其它导入 2022-11-10 16:11:59 +08:00
黎永顺 6b3f35374c 栏目权限新增自定义项 2022-11-10 16:10:21 +08:00
liang.cheng daea5ba97b Merge pull request '权限' (#16) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/16
2022-11-09 17:05:07 +08:00
Chengliang 1fd6a4c644 权限 2022-11-09 17:02:55 +08:00
黎永顺 62e8ef22c1 栏目权限页面的编写 2022-11-09 14:03:32 +08:00
liang.cheng ddb59fa9f9 Merge pull request 'bug' (#15) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/15
2022-11-09 10:20:45 +08:00
Chengliang 71bc20765d bug 2022-11-09 10:07:18 +08:00
黎永顺 21002e1e7d 栏目权限页面的编写 2022-11-08 17:43:26 +08:00
黎永顺 c4e93a30c7 Merge remote-tracking branch 'origin/dev' into dev 2022-11-08 15:56:44 +08:00
黎永顺 1a1441ac95 栏目权限页面的编写 2022-11-08 15:56:34 +08:00
liang.cheng 967453d11b Merge pull request '权限' (#14) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/14
2022-11-08 09:51:44 +08:00
Chengliang 3b4592adb5 bug修复 2022-11-08 09:49:45 +08:00
黎永顺 69441eca6c 栏目权限页面的编写 2022-11-07 16:35:58 +08:00
Chengliang 9a3164e386 权限 2022-11-03 14:33:55 +08:00
liang.cheng bfc78bee60 Merge pull request '分权开关设置' (#13) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/13
2022-11-01 17:51:09 +08:00
Chengliang f2e3c11733 卡片页面bug修复 2022-11-01 17:48:33 +08:00
Chengliang 8931a06127 分权开关设置 2022-10-31 14:33:57 +08:00
18652063575 710293d536 新增人员权限两个页面 2022-10-31 13:52:22 +08:00
liang.cheng f4f27c8ad0 Merge pull request '模块管理分权中心完整' (#12) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/12
2022-10-27 14:29:58 +08:00
Chengliang a9282a27e1 模块管理分权中心完整 2022-10-27 14:27:44 +08:00
liang.cheng 748aa1f740 Merge pull request '弹出框修改' (#11) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/11
2022-10-26 16:08:23 +08:00
Chengliang 238ccbabf8 弹出框修改 2022-10-26 16:05:39 +08:00
liang.cheng 9a9c243ec7 Merge pull request 'bug封版修复' (#10) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/10
2022-10-25 17:52:21 +08:00
Chengliang f804b45dfa bug封版修复 2022-10-25 17:50:10 +08:00
liang.cheng 291015e859 Merge pull request 'bug修复' (#9) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/9
2022-10-24 19:29:17 +08:00
Chengliang 4d79c64bcd bug修复 2022-10-24 19:27:35 +08:00
liang.cheng f4b11171b1 Merge pull request 'bug修复' (#8) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/8
2022-10-21 17:52:51 +08:00
Chengliang ebf82547d2 bug修复 2022-10-21 17:51:28 +08:00
liang.cheng c9b6f9d701 Merge pull request 'feature/cl' (#7) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/7
2022-10-21 14:43:42 +08:00
Chengliang f9cb61f140 模块管理分权 2022-10-21 14:40:47 +08:00
Chengliang 8ca38016a7 模块管理分权 2022-10-21 14:39:24 +08:00
liang.cheng 1e450a2c3c Merge pull request '人员卡片页面重做' (#6) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/6
2022-10-21 14:39:03 +08:00
Chengliang edd7e4c2a6 人员卡片页面重做 2022-10-18 13:58:48 +08:00
liang.cheng f3cfd3493f Merge pull request '卡片修复' (#5) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/5
2022-09-29 09:50:25 +08:00
Chengliang e498634292 卡片修复 2022-09-29 09:49:15 +08:00
liang.cheng 7d73c055f0 Merge pull request '我的卡片页面锚点滚动' (#4) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/4
2022-09-27 17:53:23 +08:00
Chengliang 89587a6b1a 我的卡片页面锚点滚动 2022-09-27 17:50:56 +08:00
liang.cheng 1db5570f3b Merge pull request '我的卡片' (#3) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/3
2022-09-23 16:54:45 +08:00
Chengliang d651883081 我的卡片 2022-09-23 16:53:25 +08:00
liang.cheng 444a3576c0 Merge pull request '我的卡片页面' (#2) from feature/cl into dev
Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/2
2022-09-22 18:58:12 +08:00