 zhujinyong
|
abb301884f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 15:55:03 +08:00 |
|
|
zhujinyong
|
bebc33acb4
|
* Fix bug#20651.
|
2022-03-11 15:54:36 +08:00 |
|
|
孙广明
|
3a491529c7
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2213
|
2022-03-11 07:50:07 +00:00 |
|
|
tanghucheng
|
fb78d74984
|
* Fix bug.
|
2022-03-11 15:48:25 +08:00 |
|
|
zhujinyong
|
ad46d46e81
|
* Fix comment.
|
2022-03-11 15:28:43 +08:00 |
|
|
孙广明
|
8b1c98b575
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix sql for lite grouppriv.
See merge request easycorp/zentaopms!2205
|
2022-03-11 07:24:33 +00:00 |
|
|
tanghucheng
|
c81a8d5edf
|
* Fix bug.
|
2022-03-11 15:21:29 +08:00 |
|
|
tanghucheng
|
cd84fb4d54
|
* Fix bug.
|
2022-03-11 15:09:17 +08:00 |
|
|
孙广明
|
9a68909f50
|
Merge branch 'sprint/187_hufangzhou_xuanSql' into 'master'
* Add the xuan sql when upgrade.
See merge request easycorp/zentaopms!2208
|
2022-03-11 06:58:27 +00:00 |
|
|
hufangzhou
|
8114d5cdec
|
* Rename executeXuanxuan to executedXuanxuan.
|
2022-03-11 14:57:04 +08:00 |
|
|
tianshujie
|
e20c497d01
|
* Fix bug #20678.
|
2022-03-11 14:51:33 +08:00 |
|
|
tianshujie
|
e0f54aedf2
|
* Fix bug #20676.
|
2022-03-11 14:46:26 +08:00 |
|
|
tianshujie
|
2e3438edfc
|
* Modify the code.
|
2022-03-11 14:43:18 +08:00 |
|
|
hufangzhou
|
73bf39d688
|
* Add the xuan sql when upgrade.
|
2022-03-11 14:40:01 +08:00 |
|
|
tianshujie
|
c353ff2b06
|
* Fix bug #20594.
|
2022-03-11 14:38:31 +08:00 |
|
|
孙广明
|
63786c575d
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2204
|
2022-03-11 06:08:38 +00:00 |
|
|
王怡栋
|
28a244d9a2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 14:06:23 +08:00 |
|
|
孙广明
|
bed6d563b4
|
Merge branch 'devops23_liyuchun' into 'master'
* Adjust sonarqube issue link.
See merge request easycorp/zentaopms!2201
|
2022-03-11 06:06:19 +00:00 |
|
|
王怡栋
|
f1f208db64
|
* fix bug #20669.
|
2022-03-11 14:06:04 +08:00 |
|
|
tanghucheng
|
477e89a09e
|
* Fix bug.
|
2022-03-11 14:03:30 +08:00 |
|
|
liyuchun
|
4165274307
|
* Adjust sonarqube issue link.
|
2022-03-11 13:22:37 +08:00 |
|
|
王怡栋
|
4deae7dc79
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 13:16:46 +08:00 |
|
|
王怡栋
|
1e7e9f961b
|
* fix bug #20675.
|
2022-03-11 13:16:27 +08:00 |
|
|
tianshujie
|
45a8e7f9fe
|
* Fix bug #20406.
|
2022-03-11 11:16:16 +08:00 |
|
|
tianshujie
|
b9366903dc
|
* Fix bug #20656.
|
2022-03-11 10:57:18 +08:00 |
|
|
王怡栋
|
7f8d7c6593
|
* fix bug #20490.
|
2022-03-11 10:26:33 +08:00 |
|
|
王怡栋
|
7f533c6a68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-11 10:04:11 +08:00 |
|
|
王怡栋
|
8053903ba2
|
* code for task #20556.
|
2022-03-11 10:03:48 +08:00 |
|
|
朱金勇
|
148f093d38
|
Merge branch 'sgm_upgrade' into 'master'
* Code for upgrade bug.
See merge request easycorp/zentaopms!2194
|
2022-03-11 01:20:40 +00:00 |
|
|
孙广明
|
68ae0eb009
|
* Code for upgrade bug.
|
2022-03-11 09:17:35 +08:00 |
|
|
tianshujie
|
af5a97ad40
|
* Fix bug #20591.
|
2022-03-11 08:34:54 +08:00 |
|
|
王怡栋
|
185ae2a4f8
|
* fix bug #20560.
|
2022-03-10 17:23:50 +08:00 |
|
|
zhujinyong
|
f32ff3980b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 16:22:58 +08:00 |
|
|
zhujinyong
|
819fad539e
|
* Finish story#31282, story#31284.
|
2022-03-10 16:21:27 +08:00 |
|
|
tanghucheng
|
6e0066af25
|
* Merge code.
|
2022-03-10 16:19:26 +08:00 |
|
|
孙广明
|
97859c945b
|
Merge branch 'master' into 'sprint/master_tanghucheng_fixbug'
# Conflicts:
# module/user/js/batchcreate.js
# module/user/view/batchcreate.html.php
|
2022-03-10 08:07:31 +00:00 |
|
|
tanghucheng
|
dc394cd674
|
* Fix code format.
|
2022-03-10 15:31:50 +08:00 |
|
|
tanghucheng
|
31588aacc7
|
* Adjust for batchcreate user.
|
2022-03-10 15:23:40 +08:00 |
|
|
tianshujie
|
7e89329205
|
* Fix bug #20546.
|
2022-03-10 15:09:54 +08:00 |
|
|
朱金勇
|
6efc1fad24
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade error.
See merge request easycorp/zentaopms!2185
|
2022-03-10 06:21:24 +00:00 |
|
|
sgm0422
|
ca5624db56
|
* Fix upgrade error.
|
2022-03-10 14:16:48 +08:00 |
|
|
tanghucheng
|
76fd14c845
|
* Adjust for create user.
|
2022-03-10 12:09:33 +08:00 |
|
|
孙广明
|
86bc5e14ea
|
Merge branch 'sprint/187_hufangzhou_mySetMenu' into 'master'
* Remove the unused code.
See merge request easycorp/zentaopms!2180
|
2022-03-10 03:19:27 +00:00 |
|
|
tianshujie
|
11d4052d8e
|
* Fix bug #15980.
|
2022-03-10 11:15:16 +08:00 |
|
|
hufangzhou
|
57bbeeddd7
|
* Remove the unused code.
|
2022-03-10 11:01:21 +08:00 |
|
|
sgm0422
|
479a6f5575
|
* Add pro upgrade to biz.
|
2022-03-10 10:42:29 +08:00 |
|
|
孙广明
|
cc0ae84104
|
Merge branch 'master_xieqiyu_bug#50418' into 'master'
* Fix bug#16424,#20555.
See merge request easycorp/zentaopms!2178
|
2022-03-10 02:37:42 +00:00 |
|
|
王怡栋
|
01f6eb4cc3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 10:36:40 +08:00 |
|
|
xieqiyu
|
e8a7995351
|
* Fix bug#16424,#20555.
|
2022-03-10 10:32:41 +08:00 |
|
|
王怡栋
|
53c2dd44fb
|
* fix bug #20113.
|
2022-03-10 10:31:10 +08:00 |
|