 tianshujie
|
2e3438edfc
|
* Modify the code.
|
2022-03-11 14:43:18 +08:00 |
|
|
tianshujie
|
c353ff2b06
|
* Fix bug #20594.
|
2022-03-11 14:38:31 +08:00 |
|
|
王怡栋
|
951fdbc1b6
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20652,#20511,#20643
See merge request easycorp/zentaopms!2187
|
2022-03-11 06:31:15 +00:00 |
|
|
孙广明
|
99c23e96e2
|
Merge branch 'sprint/187_hufangzhou_sqlField' into 'master'
* Remove the unused code.
See merge request easycorp/zentaopms!2206
|
2022-03-11 06:18:15 +00:00 |
|
|
hufangzhou
|
2d88fc4785
|
* Remove the unused code.
|
2022-03-11 14:16:30 +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 |
|
|
孙广明
|
7b27a47e10
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test for processTask and processTasks.
See merge request easycorp/zentaopms!2203
|
2022-03-11 06:03:26 +00:00 |
|
|
liumengyi
|
5a26608197
|
* Add auto test for processTask and processTasks.
|
2022-03-11 14:00:07 +08:00 |
|
|
Zongjun Lan
|
1c518b7a9b
|
* fix bug #20643
|
2022-03-11 13:27:29 +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 |
|
|
孙广明
|
3eb78e6a7e
|
Merge branch 'sprint/187_tianshujie_20656' into 'master'
* Fix bug #20656.
See merge request easycorp/zentaopms!2198
|
2022-03-11 03:18:17 +00:00 |
|
|
tianshujie
|
45a8e7f9fe
|
* Fix bug #20406.
|
2022-03-11 11:16:16 +08:00 |
|
|
孙广明
|
ef5dfd283d
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test.
See merge request easycorp/zentaopms!2197
|
2022-03-11 03:06:12 +00:00 |
|
|
liumengyi
|
52e7c1015e
|
* Modify code format.
|
2022-03-11 10:57:33 +08:00 |
|
|
tianshujie
|
b9366903dc
|
* Fix bug #20656.
|
2022-03-11 10:57:18 +08:00 |
|
|
liumengyi
|
79598fa2f7
|
* Add auto test.
|
2022-03-11 10:52:13 +08:00 |
|
|
Zongjun Lan
|
cb8f6ca375
|
* fix bug #20652
|
2022-03-11 10:38:23 +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 |
|
|
孙广明
|
5084aea498
|
Merge branch 'autotest_ly' into 'master'
Add execution
See merge request easycorp/zentaopms!2195
|
2022-03-11 01:29:48 +00:00 |
|
|
liyang
|
681ac8cd7d
|
Add execution
|
2022-03-11 09:24:33 +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 |
|
|
孙广明
|
c1a18dffb2
|
Merge branch 'sprint/187_tianshujie_20591' into 'master'
* Fix bug #20591.
See merge request easycorp/zentaopms!2192
|
2022-03-11 01:16:47 +00: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 |
|
|
王怡栋
|
d001d76edf
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-10 16:32:30 +08:00 |
|
|
王怡栋
|
55beac7f83
|
* fix bug #20581.
|
2022-03-10 16:31:46 +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 |
|
|
孙广明
|
8a0354d1fb
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Adjust for create and batchcreate user.
See merge request easycorp/zentaopms!2183
|
2022-03-10 08:20:04 +00: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 |
|
|
孙广明
|
ffeeafaa36
|
Merge branch 'sprint/187_hufangzhou_makefile' into 'master'
* Adjust the makefile.
See merge request easycorp/zentaopms!2191
|
2022-03-10 08:05:46 +00:00 |
|
|
hufangzhou
|
59e2f0579a
|
* Adjust the makefile.
|
2022-03-10 16:00:51 +08:00 |
|
|
孙广明
|
8f223528d0
|
Merge branch 'sprint/187_tianshujie_20546' into 'master'
* Fix bug #20546.
See merge request easycorp/zentaopms!2190
|
2022-03-10 07:42:46 +00:00 |
|
|
Zongjun Lan
|
459d1bb3e9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-03-10 15:33:51 +08: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 |
|
|
孙广明
|
c98a11da7a
|
Merge branch 'autotest_ly' into 'master'
Add execution test
See merge request easycorp/zentaopms!2189
|
2022-03-10 07:19:40 +00:00 |
|
|
liyang
|
6c50fffa51
|
Add execution test
|
2022-03-10 15:15:47 +08:00 |
|
|
tianshujie
|
7e89329205
|
* Fix bug #20546.
|
2022-03-10 15:09:54 +08:00 |
|
|
孙广明
|
394c6886ab
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of computeHours4Multiple.
See merge request easycorp/zentaopms!2188
|
2022-03-10 07:00:26 +00:00 |
|