 孙广明
|
7a2a9daaef
|
* Fix code details.
|
2021-12-31 15:04:19 +08:00 |
|
|
孙广明
|
56717fe06e
|
Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Modify judgment.
See merge request easycorp/zentaopms!1230
|
2021-12-31 05:03:28 +00:00 |
|
|
孙广明
|
94ddbd4852
|
Merge branch 'sprint/181_tianshujie_optimize' into 'master'
* Modify the problem of dragging the card.
See merge request easycorp/zentaopms!1227
|
2021-12-31 05:02:09 +00:00 |
|
|
liumengyi
|
b7af7a3754
|
* Modify judgment.
|
2021-12-31 13:00:10 +08:00 |
|
|
李玉春
|
2bb6bb8825
|
Merge branch 'refactor' into 'master'
Refactor
See merge request easycorp/zentaopms!1229
|
2021-12-31 04:25:42 +00:00 |
|
|
李玉春
|
b0d7ba1708
|
Merge branch 'sgm_46671' into 'master'
* Finish task #46671.
See merge request easycorp/zentaopms!1222
|
2021-12-31 04:19:26 +00:00 |
|
|
tianshujie
|
c6794b36f2
|
* Fix the problem of the activation operation of the card in progress.
|
2021-12-31 11:22:40 +08:00 |
|
|
孙广明
|
c871137c66
|
* Fix code style.
|
2021-12-31 11:17:42 +08:00 |
|
|
孙广明
|
ad25920cf0
|
* Refactor code.
|
2021-12-31 11:06:46 +08:00 |
|
|
tianshujie
|
28881d6e76
|
* Modify the problem of dragging the card.
|
2021-12-31 11:03:01 +08:00 |
|
|
liumengyi
|
3dd747f40a
|
* Modify judgment for split chid plan.
|
2021-12-31 10:59:37 +08:00 |
|
|
王怡栋
|
0a0bce8c91
|
Merge branch 'sprint/liyuchun_devops18' into 'master'
* Fix bug #18088.
See merge request easycorp/zentaopms!1226
|
2021-12-31 02:57:56 +00:00 |
|
|
liyuchun
|
6f03910ea1
|
* Fix bug #18088.
|
2021-12-31 10:56:33 +08:00 |
|
|
liyuchun
|
c2da5eefe2
|
Merge branch 'devops18'
|
2021-12-31 10:38:04 +08:00 |
|
|
李玉春
|
45053fc8ca
|
Merge branch 'devops18_wangyidong_bug' into 'devops18'
* adjust for z tool.
See merge request easycorp/zentaopms!1225
|
2021-12-31 02:34:58 +00:00 |
|
|
王怡栋
|
05bb5b46b8
|
* fix bug #18111.
|
2021-12-31 10:31:58 +08:00 |
|
|
王怡栋
|
f1d22a9e0e
|
Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18088.
See merge request easycorp/zentaopms!1224
|
2021-12-31 02:27:01 +00:00 |
|
|
liyuchun
|
adc4c9ad98
|
* Fix bug #18088.
|
2021-12-31 10:23:49 +08:00 |
|
|
孙广明
|
348eefb925
|
Merge branch 'sprint/181_tianshujie_error' into 'master'
* Fix the error of product dashboard block.
See merge request easycorp/zentaopms!1223
|
2021-12-31 02:21:00 +00:00 |
|
|
tianshujie
|
839d71137a
|
* Fix the error of product dashboard block.
|
2021-12-31 10:19:25 +08:00 |
|
|
孙广明
|
2746ae873a
|
Merge branch 'sprint/181_tianshujie_error' into 'master'
* Fix the error report of the product summary table under statistical navigation.
See merge request easycorp/zentaopms!1221
|
2021-12-31 01:55:39 +00:00 |
|
|
王怡栋
|
f895777dec
|
* adjust for z tool.
|
2021-12-31 09:54:58 +08:00 |
|
|
tianshujie
|
3c326d3aa9
|
* Fix the error report of the product summary table under statistical navigation.
|
2021-12-31 09:53:33 +08:00 |
|
|
孙广明
|
101be0c103
|
* Finish task #46671.
|
2021-12-31 09:53:32 +08:00 |
|
|
liumengyi
|
0894fd4898
|
* Modify judgment for split child plan.
|
2021-12-31 09:47:22 +08:00 |
|
|
王怡栋
|
d4ddd1fd72
|
Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18087.
See merge request easycorp/zentaopms!1220
|
2021-12-31 01:46:52 +00:00 |
|
|
liyuchun
|
9d5829d99c
|
* Fix bug #18087.
|
2021-12-31 09:45:58 +08:00 |
|
|
liyuchun
|
6107956524
|
* Fix bug #18087.
|
2021-12-31 09:42:24 +08:00 |
|
|
liumengyi
|
e0d72a4c25
|
* Refactoring code for update status.
|
2021-12-31 09:40:46 +08:00 |
|
|
孙广明
|
7f75304d63
|
Merge branch 'sprint/181_tianshujie_lane' into 'master'
* Fix bug #18094,#18077.
See merge request easycorp/zentaopms!1218
|
2021-12-31 00:59:04 +00:00 |
|
|
tianshujie
|
7b3bab2c4a
|
* Fix bug #18094,#18077.
|
2021-12-31 08:57:08 +08:00 |
|
|
孙广明
|
212ce8b9bf
|
Merge branch 'sprint/181_zhengrunyu_Fixbug' into 'master'
*Fix bug.
See merge request easycorp/zentaopms!1217
|
2021-12-31 00:45:37 +00:00 |
|
|
王怡栋
|
03dfe14a43
|
Merge branch 'devops18_liyuchun' into 'devops18'
* Fix bug #18087,18092.
See merge request easycorp/zentaopms!1216
|
2021-12-31 00:16:11 +00:00 |
|
|
zhengrunyu
|
eaf5bd6c50
|
*Fix bug.
|
2021-12-30 18:21:26 +08:00 |
|
|
liyuchun
|
c26309ad13
|
* Fix bug #18087,18092.
|
2021-12-30 17:49:04 +08:00 |
|
|
孙广明
|
f122870e36
|
Merge branch 'sprint/181_zhengrunyu_fixbug'
|
2021-12-30 16:48:26 +08:00 |
|
|
孙广明
|
4c9dcd4af9
|
Merge branch 'master' into 'sprint/181_zhengrunyu_fixbug'
# Conflicts:
# module/productplan/model.php
|
2021-12-30 08:48:11 +00:00 |
|
|
zhengrunyu
|
a3e758269a
|
*Code batchedit
|
2021-12-30 16:38:50 +08:00 |
|
|
孙广明
|
7af8683be4
|
Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master'
* Modify print label code of plan list.
See merge request easycorp/zentaopms!1212
|
2021-12-30 08:33:36 +00:00 |
|
|
孙广明
|
7356af0232
|
Merge branch 'sprint/max_tanghucheng_46677' into 'master'
* Finish task #46677.
See merge request easycorp/zentaopms!1202
|
2021-12-30 08:30:07 +00:00 |
|
|
liumengyi
|
abd52e3141
|
* Modify print label code of plan list.
|
2021-12-30 16:25:32 +08:00 |
|
|
王怡栋
|
2f86ca39d8
|
Merge branch 'devops18_liyuchun' into 'devops18'
Fix bug #18078.
See merge request easycorp/zentaopms!1211
|
2021-12-30 08:15:53 +00:00 |
|
|
孙广明
|
355665690b
|
Merge branch 'sprint/32_zhouxin_46674' into 'master'
Sprint/32 zhouxin 46674
See merge request easycorp/zentaopms!1195
|
2021-12-30 08:15:39 +00:00 |
|
|
李玉春
|
1738b220e7
|
Merge branch 'sgm_fixbug' into 'master'
* Fix merge code bug.
See merge request easycorp/zentaopms!1210
|
2021-12-30 08:15:20 +00:00 |
|
|
孙广明
|
a02d19a0c4
|
* Fix merge code bug.
|
2021-12-30 16:14:12 +08:00 |
|
|
liyuchun
|
55c7c7e848
|
* Fix bug #18078.
|
2021-12-30 16:13:40 +08:00 |
|
|
孙广明
|
febaa0ffb8
|
Merge branch 'sgm_46670'
|
2021-12-30 16:13:19 +08:00 |
|
|
孙广明
|
7267c50600
|
Merge branch 'master' into 'sgm_46670'
# Conflicts:
# module/productplan/model.php
|
2021-12-30 08:12:11 +00:00 |
|
|
zhouxin
|
50dabf7bd7
|
Refactor method checkCanChangeModel.
|
2021-12-30 08:09:50 +00:00 |
|
|
孙广明
|
e9c8da2f1e
|
* Finish task #46670.
|
2021-12-30 16:04:32 +08:00 |
|