Commit Graph

386 Commits

Author SHA1 Message Date
zhouxudong
65fff67e58 * finish task #53651. 2022-05-12 00:30:00 +00:00
zhouxudong
c0886b850d * Finish task #53651. 2022-05-11 05:49:21 +00:00
zhouxudong
ca827e1d6c * Finish task #53651. 2022-05-11 05:32:48 +00:00
zhouxudong
1723a78c92 * Finish task #53651. 2022-05-10 09:11:06 +00:00
daitingting
d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2
a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00
xieqiyu
88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
sunjun
c2d9f7b240 *Fixbug_sunjun_22007 2022-04-28 02:48:11 +00:00
sunjun
0495a32a20 *Fixbug_sunjun_22007 2022-04-27 07:59:37 +00:00
xieqiyu
8f849cc8c3 * Fix bug#21640. 2022-04-19 16:06:27 +08:00
xieqiyu
e7314a8343 * Fix bug#19625. 2022-04-12 15:27:51 +08:00
tianshujie
0530b892e4 * Fix bug #18710. 2022-04-06 15:22:15 +08:00
孙广明
30645ffbff Merge branch 'master_xieqiyu_21334' into 'master'
* Fix bug#21334.

See merge request easycorp/zentaopms!2729
2022-04-02 08:10:36 +00:00
王怡栋
c18710567b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-02 14:44:44 +08:00
王怡栋
6edb5fe805 * fix bug #21413. 2022-04-02 14:44:18 +08:00
xieqiyu
c0a9bad1a6 * Fix bug#21334. 2022-04-02 11:25:18 +08:00
孙广明
3e8175b22e Merge branch 'master_xieqiyu_21385' into 'master'
* Fix bug#21385.

See merge request easycorp/zentaopms!2711
2022-04-02 02:18:37 +00:00
王怡栋
4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tianshujie
7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00
xieqiyu
c5eb774fdd * Fix bug#21385. 2022-04-01 14:24:05 +08:00
zenggang
d63710351c * Fix bug#11161 2022-04-01 02:06:20 +00:00
孙广明
5cc345e666 Merge branch 'master_xieqiyu_19665' into 'master'
* Fix bug#19665.

See merge request easycorp/zentaopms!2676
2022-03-31 09:42:04 +00:00
xieqiyu
2a57f4fd28 * Fix bug#19665. 2022-03-31 16:08:33 +08:00
tianshujie
deeced3e14 * Fix bug #21307. 2022-03-31 16:04:41 +08:00
tianshujie
b1bb3b7400 * Fix bug #21300. 2022-03-31 15:15:24 +08:00
孙广明
e2c29e7854 Merge branch 'sprint/master_zhouxudong_18270' into 'master'
Sprint/master zhouxudong 18270

See merge request easycorp/zentaopms!2654
2022-03-31 03:08:33 +00:00
孙广明
36244ef5a2 Merge branch 'fixbugs_zhouxin_20813' into 'master'
* Fix bug #20813.

See merge request easycorp/zentaopms!2646
2022-03-30 09:14:08 +00:00
王怡栋
08e3b0e29d Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/execution/model.php
2022-03-30 08:01:18 +00:00
tanghucheng
19e6390ed7 * Fix bug #20890. 2022-03-30 15:16:52 +08:00
zhouxin
2280c483ad * Fix bug #20813. 2022-03-30 05:30:10 +00:00
孙广明
3a808fc514 Merge branch 'fixbugs_zhouxin_17322' into 'master'
Fixbugs zhouxin 17322

See merge request easycorp/zentaopms!2631
2022-03-30 05:12:36 +00:00
zhouxin
a8d3ff2801 * Fix bug #17322. 2022-03-30 05:11:32 +00:00
zhouxudong
c7e76c1176 * Fix bug #18270. 2022-03-30 13:05:59 +08:00
zhouxin
5cfff22e5a * Fix bug #21131. 2022-03-30 03:27:30 +00:00
zhouxin
1d21f7f62d * Fix bug #17322. 2022-03-30 03:23:48 +00:00
xieqiyu
f418c9b954 * Fix bug#21283. 2022-03-30 11:10:49 +08:00
zhouxudong
3e70b88210 * Fix bug #18270. 2022-03-29 14:49:01 +08:00
sunjun
a2e9c28f6e *Fixbug #21258 2022-03-29 11:12:02 +08:00
李玉春
9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun
b411be89ec *Fixbug #13852 2022-03-29 08:44:48 +08:00
sunjun
0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
zhouxin
ce6da7784b * Fix bug #21221. 2022-03-28 05:58:42 +00:00
sunjun
79016f3bf7 *Fixbug #13852 2022-03-28 10:00:29 +08:00
王怡栋
15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
tanghucheng
1954837f7f * Code for bug #21164. 2022-03-25 14:57:25 +08:00
tanghucheng
4ecf869644 * Fix bug #21164. 2022-03-25 14:42:54 +08:00
mayue
f184873bca * Fix bug #17402. 2022-03-25 13:45:28 +08:00
孙广明
e4189b329c * Fix whitelist bug. 2022-03-25 10:21:50 +08:00
zhouxin
7d0d641629 * Fix bug #20813. 2022-03-24 09:31:57 +00:00
sunjun
43bfd5a4c1 *Fixbug 21115 2022-03-24 16:52:03 +08:00