 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 |
|
|
王怡栋
|
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 |
|
|
孙广明
|
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 |
|
|
liyuchun
|
b45ec10f40
|
* Fix bug #18078.
|
2021-12-30 15:36:33 +08:00 |
|
|
李玉春
|
1c88e99c78
|
Merge branch 'devops18_18046' into 'devops18'
* Fix bug#18046 and adjust code
See merge request easycorp/zentaopms!1199
|
2021-12-30 07:31:37 +00:00 |
|
|
李玉春
|
26621179fd
|
Merge branch 'devops18_wangyidong_46553' into 'devops18'
* fix error.
See merge request easycorp/zentaopms!1206
|
2021-12-30 07:30:53 +00:00 |
|
|
王怡栋
|
889d958757
|
Merge branch 'devops18_liyuchun' into 'devops18'
Devops18 liyuchun
See merge request easycorp/zentaopms!1203
|
2021-12-30 07:27:29 +00:00 |
|
|
liyuchun
|
c35185b5bf
|
* Adjust base64.
|
2021-12-30 15:23:29 +08:00 |
|
|
孙广明
|
2a08f5e7c2
|
Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master'
* Fix bug for update status.
See merge request easycorp/zentaopms!1204
|
2021-12-30 07:22:39 +00:00 |
|
|
liumengyi
|
3602538f9c
|
* Fix bug for update status.
|
2021-12-30 15:21:09 +08:00 |
|
|
王怡栋
|
0552eec334
|
* fix error.
|
2021-12-30 15:19:59 +08:00 |
|
|
liyuchun
|
930538179b
|
* Fix eroor with special symbols.
|
2021-12-30 15:18:27 +08:00 |
|
|
zhouxin
|
e9231b595a
|
Change configuration file.
|
2021-12-30 07:16:28 +00:00 |
|
|
孙广明
|
d769e7045b
|
Merge branch 'sprint/181_liumengyi_addChildLabel' into 'master'
* Add child label.
See merge request easycorp/zentaopms!1201
|
2021-12-30 07:15:04 +00:00 |
|
|
liumengyi
|
ebe4c65807
|
* Add child Label.
|
2021-12-30 15:11:43 +08:00 |
|
|
tanghucheng
|
9f341e49ed
|
* Finish task #46677.
|
2021-12-30 15:10:54 +08:00 |
|
|
zenggang
|
fce6751316
|
* Fix bug#18046 and adjust code
|
2021-12-30 07:06:37 +00:00 |
|
|
孙广明
|
470b2730e5
|
Merge branch 'sprint/181_tianshujie_button' into 'master'
* The plan is completed or closed grayed out to create an execution button.
See merge request easycorp/zentaopms!1196
|
2021-12-30 06:48:23 +00:00 |
|
|
孙广明
|
86994c2af9
|
Merge branch 'sprint/181_liumengyi_modify' into 'master'
* Fix bug for task #46654.
See merge request easycorp/zentaopms!1193
|
2021-12-30 06:44:40 +00:00 |
|