 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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
71f49f171f
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!2246
|
2022-03-14 09:10:18 +00:00 |
|
|
李玉春
|
cfa195f7e5
|
Merge branch 'sprint/tianshujie_group' into 'master'
* Fix the problem that professional R&D Kanban does not have permission to view.
See merge request easycorp/zentaopms!2245
|
2022-03-14 09:04:04 +00:00 |
|
|
[denghongtao]
|
7cbde4dcfe
|
* Add auto unit.
|
2022-03-14 17:01:23 +08:00 |
|
|
tianshujie
|
3c25a51bf2
|
* Fix bug #20738.
|
2022-03-14 16:59:51 +08:00 |
|
|
tanghucheng
|
64f44170e5
|
* Fix bug.
|
2022-03-14 16:58:34 +08:00 |
|
|
tianshujie
|
937c1a64ab
|
* Fix the problem that professional R&D Kanban does not have permission to view.
|
2022-03-14 16:49:46 +08:00 |
|
|
孙广明
|
454ee03f10
|
Merge branch 'autotest_ly' into 'master'
update data and add execution
See merge request easycorp/zentaopms!2244
|
2022-03-14 08:47:39 +00:00 |
|
|
liyang
|
dea36cfea3
|
update data and add execution
|
2022-03-14 16:45:33 +08:00 |
|
|
Zongjun Lan
|
e9806c290e
|
* fix bug #19430
|
2022-03-14 16:42:46 +08:00 |
|
|
朱金勇
|
1ce864d374
|
Merge branch 'sgm_sql' into 'master'
* Fix bug #20725
See merge request easycorp/zentaopms!2241
|
2022-03-14 08:37:12 +00:00 |
|
|
孙广明
|
37153ad060
|
* Fix bug #20725
|
2022-03-14 16:34:49 +08:00 |
|
|
孙广明
|
287c8f7b86
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Modify the problem of deleting two out file commands.
See merge request easycorp/zentaopms!2238
|
2022-03-14 08:13:32 +00:00 |
|
|
王怡栋
|
8bc5c57b78
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 16:09:24 +08:00 |
|
|
王怡栋
|
c1f3258a74
|
* adjust for get dynamic.
|
2022-03-14 16:08:58 +08:00 |
|
|
tianshujie
|
531422c8a0
|
* Modify the problem of deleting two out file commands.
|
2022-03-14 16:07:45 +08:00 |
|
|
孙广明
|
2e83840675
|
Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #19820,20528.
See merge request easycorp/zentaopms!2233
|
2022-03-14 08:03:51 +00:00 |
|
|
王怡栋
|
e08cbf07d0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 15:52:40 +08:00 |
|
|
王怡栋
|
aa38fe6ec9
|
* adjust for compute burn.
|
2022-03-14 15:50:57 +08:00 |
|
|
Zongjun Lan
|
3d936d7dc8
|
* fix bug #20703
|
2022-03-14 15:43:15 +08:00 |
|
|
zhujinyong
|
ea63748351
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-14 15:12:53 +08:00 |
|
|
zhujinyong
|
976299d506
|
* Fix type of fields.
|
2022-03-14 15:12:32 +08:00 |
|
|
tanghucheng
|
d32f3d2664
|
* Fix bug #19820,20528.
|
2022-03-14 14:51:03 +08:00 |
|
|
孙广明
|
d1a3c84b57
|
Merge branch 'autoTest_liumengyi_task' into 'master'
* Add auto test of task.
See merge request easycorp/zentaopms!2232
|
2022-03-14 06:42:12 +00:00 |
|
|
liumengyi
|
3c75a1555e
|
* Add auto test of task.
|
2022-03-14 14:39:59 +08:00 |
|
|
朱金勇
|
0ba0e25d66
|
Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade bug.
See merge request easycorp/zentaopms!2230
|
2022-03-14 06:36:24 +00:00 |
|
|
孙广明
|
140c7652ad
|
* Fix upgrade bug.
|
2022-03-14 14:23:19 +08:00 |
|