 朱金勇
|
8a4bda1fb8
|
Merge branch 'sgm_upgrade' into 'master'
* Change version.
See merge request easycorp/zentaopms!2283
|
2022-03-16 00:40:49 +00:00 |
|
|
孙广明
|
c498c964ba
|
* Change version.
|
2022-03-16 08:35:21 +08:00 |
|
|
孙广明
|
985a3d5d95
|
Merge branch 'autotest_ly' into 'master'
add execution test
See merge request easycorp/zentaopms!2280
|
2022-03-15 09:17:11 +00:00 |
|
|
liyang
|
0fecbc4834
|
add execution test
|
2022-03-15 17:13:16 +08:00 |
|
|
孙广明
|
4883fe8444
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add function annotations.
See merge request easycorp/zentaopms!2277
|
2022-03-15 08:58:51 +00:00 |
|
|
liumengyi
|
d8f9da553f
|
* Add function annotations.
|
2022-03-15 16:54:32 +08:00 |
|
|
王怡栋
|
092c020b32
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20692
See merge request easycorp/zentaopms!2272
|
2022-03-15 08:42:55 +00:00 |
|
|
孙广明
|
69c22ecbf3
|
Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20779,20782,20783.
See merge request easycorp/zentaopms!2275
|
2022-03-15 08:34:33 +00:00 |
|
|
tanghucheng
|
72095bf38a
|
* Fix bug #20803.
|
2022-03-15 16:31:27 +08:00 |
|
|
tanghucheng
|
88230cd949
|
* Fix bug #20779,20782,20783.
|
2022-03-15 15:49:25 +08:00 |
|
|
孙广明
|
9d2c1baa9f
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2274
|
2022-03-15 07:48:07 +00:00 |
|
|
liumengyi
|
2550fd101c
|
* Add auto test of task.
|
2022-03-15 15:45:02 +08:00 |
|
|
朱金勇
|
9ae2933c5e
|
Merge branch 'sgm_unittest' into 'master'
Sgm unittest
See merge request easycorp/zentaopms!2273
|
2022-03-15 07:44:47 +00:00 |
|
|
孙广明
|
69fc328a1e
|
* Code for auto test.
|
2022-03-15 15:41:39 +08:00 |
|
|
Zongjun Lan
|
114416d345
|
* fix bug #20692
|
2022-03-15 15:36:07 +08:00 |
|
|
王怡栋
|
2acf7fd44e
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20760,#20761,#20762,#20763
See merge request easycorp/zentaopms!2267
|
2022-03-15 07:24:22 +00:00 |
|
|
孙广明
|
df49ac6f81
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Change file name to lowercase.
See merge request easycorp/zentaopms!2271
|
2022-03-15 07:16:29 +00:00 |
|
|
liumengyi
|
33ef68d31b
|
* Change file name to lowercase.
|
2022-03-15 14:58:35 +08:00 |
|
|
孙广明
|
503e169dbd
|
Merge branch 'sprint/187_hufangzhou_20735' into 'master'
* Fix bug #20735.
See merge request easycorp/zentaopms!2269
|
2022-03-15 06:36:53 +00:00 |
|
|
王怡栋
|
78de67f523
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-15 14:31:51 +08:00 |
|
|
hufangzhou
|
0ead3997b7
|
* Fix bug #20735.
|
2022-03-15 14:31:43 +08:00 |
|
|
王怡栋
|
9ffa55da56
|
* fix bug #20682.
|
2022-03-15 14:31:01 +08:00 |
|
|
Zongjun Lan
|
3a090c6034
|
* fix bug #20760,#20761,#20762,#20763
|
2022-03-15 13:55:46 +08:00 |
|
|
孙广明
|
28f4a13262
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2266
|
2022-03-15 05:55:18 +00:00 |
|
|
liumengyi
|
efb3d070a6
|
* Add auto test of task.
|
2022-03-15 13:53:00 +08:00 |
|
|
孙广明
|
2b9fcb67f5
|
* Code for batch create.
|
2022-03-15 13:36:29 +08:00 |
|
|
孙广明
|
78f64fdb32
|
* Add batch create user unit test.
|
2022-03-15 13:33:38 +08:00 |
|
|
孙广明
|
8b35b4d392
|
Merge branch 'sprint/master_tanghucheng_fix'
|
2022-03-15 13:14:56 +08:00 |
|
|
孙广明
|
fa3c92e03f
|
Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
# db/update16.4.sql
|
2022-03-15 05:13:52 +00:00 |
|
|
tanghucheng
|
771cde761c
|
* Fix bug #20757.
|
2022-03-15 13:09:24 +08:00 |
|
|
zhujinyong
|
841897faca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-15 12:24:24 +08:00 |
|
|
zhujinyong
|
28c73c8ec6
|
* Fix error of task api.
|
2022-03-15 12:23:57 +08:00 |
|
|
王怡栋
|
286aa9c7d0
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #19535
See merge request easycorp/zentaopms!2260
|
2022-03-15 03:29:28 +00:00 |
|
|
王怡栋
|
2ae8b25fa9
|
Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20754,20776,20759.
See merge request easycorp/zentaopms!2262
|
2022-03-15 03:27:08 +00:00 |
|
|
tanghucheng
|
9cffc3bcf7
|
* Fix bug #20754,20776,20759.
|
2022-03-15 11:13:26 +08:00 |
|
|
Zongjun Lan
|
5be25315f3
|
* fix bug #19535
|
2022-03-15 11:10:30 +08:00 |
|
|
孙广明
|
dfee4a2529
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2258
|
2022-03-15 02:36:23 +00:00 |
|
|
liumengyi
|
a6c7e4c765
|
* Add auto test of task.
|
2022-03-15 10:34:27 +08:00 |
|
|
孙广明
|
7368f0df87
|
Merge branch 'sprint/tianshujie_fixbug_20751' into 'master'
* Fix bug #20751.
See merge request easycorp/zentaopms!2256
|
2022-03-15 02:01:38 +00:00 |
|
|
tianshujie
|
305ec3c69a
|
* Modify code location.
|
2022-03-15 09:57:56 +08:00 |
|
|
tianshujie
|
ffe15a3b23
|
* Fix bug #20751.
|
2022-03-15 09:54:53 +08:00 |
|
|
孙广明
|
67d54ada83
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #20751.
See merge request easycorp/zentaopms!2255
|
2022-03-15 01:43:02 +00:00 |
|
|
tianshujie
|
ff24c06fc9
|
* Modify the code judgment logic.
|
2022-03-15 09:41:54 +08:00 |
|
|
孙广明
|
e9178394fc
|
Merge branch 'autotest_denghongtao' into 'master'
* Add auto unit.
See merge request easycorp/zentaopms!2248
|
2022-03-15 01:39:52 +00:00 |
|
|
tianshujie
|
91e99b699b
|
* Fix bug #20751.
|
2022-03-15 09:36:13 +08:00 |
|
|
王怡栋
|
6e9d75f2bd
|
Merge branch 'sprint/master_tanghucheng_fix' into 'master'
* Fix bug #20741,20737,20734,20733.
See merge request easycorp/zentaopms!2254
|
2022-03-15 01:11:38 +00:00 |
|
|
tanghucheng
|
75ab5773c4
|
* Fix bug #20741,20737,20734,20733.
|
2022-03-15 09:08:14 +08:00 |
|
|
王怡栋
|
c5d1d463a8
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20703,#19430
See merge request easycorp/zentaopms!2235
|
2022-03-15 00:58:13 +00:00 |
|
|
王怡栋
|
e2fad711b4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 17:28:35 +08:00 |
|
|
王怡栋
|
3c1865c527
|
* adjust code for order by.
|
2022-03-14 17:28:14 +08:00 |
|