Commit Graph

3310 Commits

Author SHA1 Message Date
xieqiyu
97d4792fbf * Fix bug of create bug. 2023-01-05 10:13:34 +08:00
xieqiyu
ee5aacbd35 * Fix bug#31467. 2023-01-05 10:05:45 +08:00
xieqiyu
e8edfb8df8 * Code for task#81779. 2023-01-04 09:33:43 +08:00
xieqiyu
bf0ee11b80 * Code for task#81779. 2023-01-04 09:11:27 +08:00
xieqiyu
43db2ac853 * Adjust code style. 2023-01-04 08:28:55 +08:00
xieqiyu
bc620ef34d * Code for task#81779. 2023-01-03 17:36:33 +08:00
xieqiyu
62070301f4 * Code for task#81779. 2023-01-03 17:04:09 +08:00
tanghucheng
62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
田淑杰
b790198243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-30 08:46:01 +08:00
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
孙广明
d43c6ea13f Merge branch 'sprint_bug_30923' into 'zentaopms_277'
* Fix bug #30923.

See merge request easycorp/zentaopms!6649
2022-12-29 08:27:38 +00:00
liuhong
421d0b5eaa * Adjust code for bug 30923. 2022-12-29 08:26:22 +00:00
田淑杰
866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
liuhong
4b5d820e71 * Fix bug #30923. 2022-12-29 07:15:10 +00:00
liuyongkai
4d20218f56 * Resolve feedback #1849. 2022-12-28 16:28:59 +08:00
caoyanyi
fdc6a81e4d * Modify page style. 2022-12-26 17:22:20 +08:00
caoyanyi
ea5be4ade0 * Modify bug create page style. 2022-12-26 17:10:07 +08:00
caoyanyi
312ee9ce96 * Finish task #81094. 2022-12-26 13:43:18 +08:00
liuhong
81b6fec57f * Fix bug #30899. 2022-12-26 00:53:49 +00:00
wangyidong
e6eddbb075 * fix bug #30242. 2022-12-21 17:31:08 +08:00
wangyidong
bc02660990 * code for task #80451. 2022-12-21 15:50:17 +08:00
wangyidong
034c750da5 * code for task #80457. 2022-12-21 15:15:28 +08:00
caoyanyi
71bc8ac80a Merge branch 'master' into zenops_46 2022-12-21 13:56:27 +08:00
wangyidong
164cca5ffe * code task #80451. 2022-12-21 10:31:46 +08:00
tanghucheng
5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
wangyidong
58efe7b011 * code task #80458,80463. 2022-12-20 11:31:15 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
hufangzhou
e248cd064b * Handle feedback #1723. 2022-12-14 00:45:03 +00:00
wangyidong
4ca4c4ccdb * fix bug #30748. 2022-12-13 17:06:14 +08:00
Yagami
b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
孙广明
cb6a64eede Merge branch 'master_bug_30609' into 'master'
* Fix bug #30609.

See merge request easycorp/zentaopms!6511
2022-12-09 08:56:19 +00:00
孙广明
8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
2022-12-09 06:48:13 +00:00
lanzongjun
dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
wangyidong
3c3cacc47c * adjust code. 2022-12-09 08:44:13 +08:00
wangyidong
adc9fb7c3d * fix bug #30532. 2022-12-09 08:39:49 +08:00
liuhong
1001e35d9b * Fix bug #30609. 2022-12-08 16:38:50 +00:00
wangyidong
d9b0d2c2c4 * fix bug #30536. 2022-12-08 16:50:48 +08:00
孙广明
1ea5ad8245 Merge branch 'master_liuhong_78696' into 'master'
Master liuhong 78696

See merge request easycorp/zentaopms!6471
2022-12-07 01:33:32 +00:00
王怡栋
a6ab5060b9 Merge branch 'cyy_optimize' into 'master'
Cyy optimize

See merge request easycorp/zentaopms!6470
2022-12-06 09:31:34 +00:00
liuyongkai
069a8d4a06 * Resolve feedback #1398. 2022-12-06 13:54:54 +08:00
liuhong
a3893c9046 *Adjuct code for task #78696. 2022-12-06 05:11:07 +00:00
caoyanyi
86e46d3e3e * Modify bug create page style. 2022-12-06 11:48:04 +08:00
liuhong
377ba07d06 * Fix task code for #78696. 2022-12-06 03:28:33 +00:00
liuhong
925367c9ca * Adjust code for task #78696. 2022-12-06 02:04:47 +00:00
liuhong
346173fcd9 * Fix task #78696. 2022-12-05 05:57:08 +00:00
daitingting
14ea643f61 * Finish task #78361,#78362. 2022-12-02 08:03:37 +00:00
caoyanyi
f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
daitingting
995f927ae6 * Fix bug for task #77615,#77616. 2022-12-01 08:36:46 +00:00
wangyidong
22081a43de * fix bug #30425. 2022-12-01 14:15:35 +08:00
wangyidong
283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00