Commit Graph
2046 Commits
Author SHA1 Message Date
mayue fb9bc91030 * Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973. 2021-11-03 15:38:49 +08:00
hufangzhou 8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
李玉春 d4fdd7b9e2 Merge branch 'sprint/169_tianshujie_43621' into 'sprint/169'
* Finish task #43621.

See merge request easycorp/zentaopms!249
2021-11-01 02:45:38 +00:00
tianshujie 96513f604e * Modify and maintain product line logic. 2021-11-01 10:21:11 +08:00
tianshujie f78f9ecdfe * Finish task #43621. 2021-11-01 10:18:21 +08:00
孙广明 d17f0f28ce Merge branch 'sprint/169_tanghucheng_43707' into 'sprint/169'
* Finish task #43707.

See merge request easycorp/zentaopms!236
2021-11-01 02:18:14 +00:00
root 0a6a4d2e1d sovle bug 15467 2021-11-01 09:39:07 +08:00
root 6db04fa88e bug_15467 2021-11-01 09:29:45 +08:00
mayue 217927ce09 * Fix a bug #15835. 2021-10-29 14:47:21 +08:00
tanghucheng de6cda0e2f * Finish task #43707. 2021-10-29 14:39:23 +08:00
mayue 539fb5d7b0 *Fix a bug #15778. 2021-10-28 15:13:15 +08:00
mayue 936770dc65 *Fix a bug #15778. 2021-10-28 14:48:20 +08:00
mayue 92b450679a *Fix a bug #15776. 2021-10-28 13:32:15 +08:00
孙广明 968c53b3ab Merge branch 'sprint/169_tanghucheng_43541' into 'sprint/169'
Finish task #43541

See merge request easycorp/zentaopms!186
2021-10-27 09:00:41 +00:00
tanghucheng 82d42ca24a * Finish task #43541. 2021-10-27 16:37:30 +08:00
tanghucheng 9cc238ca96 * Finish task #43541. 2021-10-27 16:34:43 +08:00
tanghucheng 4ea309a73d * Finish task #43541. 2021-10-27 16:30:56 +08:00
tanghucheng a0d22615b8 Merge branch 'sprint/169_tanghucheng_43541' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/169_tanghucheng_43541 2021-10-27 16:19:24 +08:00
tanghucheng 635f4e1c35 * Finish task #43541. 2021-10-27 16:14:35 +08:00
tanghucheng d2cca97b50 * Finish task #43541. 2021-10-27 14:19:38 +08:00
李玉春 ee48738da8 Merge branch 'sprint/169_tianshujie_43540' into 'sprint/169'
* Fix bug #43540.

See merge request easycorp/zentaopms!174
2021-10-27 06:10:09 +00:00
tianshujie 9fac2ea22e * Fix bug #43540. 2021-10-27 13:50:27 +08:00
wangjingbo 706128a141 * Finish task #43541. 2021-10-26 15:39:25 +08:00
李玉春 83f19c2b65 Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167'
* Finish task #43190.

See merge request easycorp/zentaopms!69
2021-10-15 01:31:16 +00:00
tianshujie f0bd7efdef * Finish task #43190. 2021-10-14 16:42:04 +08:00
王怡栋 a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
xieqiyu b7da8b63b3 * Code for bug#15513. 2021-10-14 15:32:37 +08:00
xieqiyu 92462e266a * Code for bug#15518. 2021-10-14 14:47:32 +08:00
李玉春 8e1161b02c Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
* Finish task #43169.

See merge request easycorp/zentaopms!64
2021-10-14 05:05:12 +00:00
xieqiyu b811e3c80d * Fix bug#15513. 2021-10-14 10:05:58 +08:00
tianshujie f5e1ceb880 * Finish task #43169. 2021-10-14 09:24:16 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
tianshujie d69aeae3b9 * Adjust the style of the project list under the product. 2021-10-11 15:58:09 +08:00
tianshujie 1af5598b1a * Finish task #43190. 2021-10-11 14:53:53 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
zenggang f139f00e61 * Task 42862,previously committed to the master branch, now resubmit to the 165 branch 2021-09-30 11:19:05 +08:00
朱金勇 aa86fdea50 Merge branch 'sprint/165_liyuchun_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!38
2021-09-28 07:37:30 +00:00
liyuchun 9b5a28392b * Finish task #42854. 2021-09-28 12:31:59 +08:00
dingna 27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
zenggang c6b7f25fa3 * Adjust code style. 2021-09-18 14:08:31 +08:00
zenggang 4380f4d4b0 * Fix bug#14580 2021-09-18 11:01:08 +08:00
zenggang 497bcdb574 * Fix bug#14490 2021-09-17 11:11:36 +08:00
zenggang 1a0effc1e6 * Fix bug15211,14525 2021-09-17 09:51:23 +08:00
zenggang ee07a042a4 * Fix bug#15211,14525 2021-09-16 17:31:40 +08:00
zenggang c352c8b9df * Fix bug#14830 2021-09-16 09:43:41 +08:00
tianshujie caaaa90cf5 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 15:56:33 +08:00
tianshujie 441cda176d * Modify the global creation return link. 2021-09-15 15:56:19 +08:00
xieqiyu 444b29404a * Fix bug#14585. 2021-09-15 15:36:09 +08:00
hufangzhou 8847360d38 * Fix bug #15197. 2021-09-15 15:06:02 +08:00
hufangzhou 9ff54e4738 * Fix bug #15150. 2021-09-15 09:12:28 +08:00