Commit Graph
928 Commits
Author SHA1 Message Date
tianshujie 0a9d779008 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-28 08:52:00 +08:00
caoyanyi 8f553370b0 * Update module sort. 2023-03-27 14:41:55 +08:00
caoyanyi 4712c71163 * Modify module update. 2023-03-27 13:52:23 +08:00
caoyanyi 3c24f9b54d Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-27 13:05:56 +08:00
caoyanyi 488915eab6 * Modify order update. 2023-03-27 13:05:41 +08:00
wangyidong c87ea9131a * fix for sonar. 2023-03-27 11:34:22 +08:00
tianshujie 9c908e4907 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-27 11:24:32 +08:00
caoyanyi 9e58c56930 * Modify module save. 2023-03-27 08:48:16 +08:00
tianshujie 49f278a092 * Modify create module method. 2023-03-24 09:16:24 +08:00
guofeilong 26d69ab0a2 * Adjust code . 2023-03-24 08:37:13 +08:00
caoyanyi 9fec0d5890 * Modify tree create. 2023-03-23 16:13:24 +08:00
tianshujie 45f2b40b7d Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-23 15:49:01 +08:00
tianshujie f98ec5fc1c * Fix error. 2023-03-23 15:48:50 +08:00
caoyanyi 4c20a2428d * Modify module create. 2023-03-23 14:51:00 +08:00
caoyanyi 1170c1ed95 + Add module create. 2023-03-23 09:05:34 +08:00
liumengyi cdeb1c7e4c * Finish task #86286. 2023-03-17 07:07:40 +00:00
liumengyi 94d4b5419b * Fix bug #32958. 2023-03-16 05:16:26 +00:00
liumengyi 34de9a5fe4 * Fix bug #32958. 2023-03-16 05:10:56 +00:00
wangyidong 3348925050 * fix bug #32176. 2023-03-16 10:35:33 +08:00
tianshujie dc8fdfb263 * Modify product line language. 2023-03-15 10:56:13 +08:00
caoyanyi cea165d8bb * Update product common lang. 2023-03-08 10:06:49 +08:00
xieqiyu 86308137c7 * Code for bug#28673. 2023-02-16 08:59:37 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu b0b04b0144 * Code for bug#32089. 2023-02-13 17:08:33 +08:00
xieqiyu eb176697b1 * Fix bug#30859. 2023-02-01 10:48:48 +08:00
王怡栋 b75714f5b1 Merge branch 'zentaopms_284_task_#83030' into 'master'
* Finish task #83030.

See merge request easycorp/zentaopms!6800
2023-01-30 08:03:30 +00:00
daitingting af2dc8014c * Finish task #83030. 2023-01-30 07:32:19 +00:00
xieqiyu 67a4f16f74 * Fix bug#31685. 2023-01-18 15:12:14 +08:00
hufangzhou 3a51b751ef * Add the new Version. 2022-12-27 00:54:30 +00:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
孙广明 dc33dd6283 Merge branch 'master_xieqiyu_30891' into 'master'
* Fix bug#30891.

See merge request easycorp/zentaopms!6576
2022-12-16 05:06:37 +00:00
孙广明 9a6929062a * Fix bug #30882. 2022-12-16 11:12:40 +08:00
xieqiyu f17dbd2c68 * Fix bug#30861. 2022-12-16 11:01:03 +08:00
xieqiyu 6d970f0935 * Code for task#79444. 2022-12-15 14:33:39 +08:00
lanzongjun 43b667ba2b * Finish Bug #30700 2022-12-08 16:16:16 +08:00
lanzongjun 47284dc742 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-08 14:45:33 +08:00
lanzongjun e6989dc17c * Finish Bug #30687 2022-12-08 14:32:27 +08:00
xieqiyu ec6f263bd3 * Code for task#78661. 2022-12-07 21:42:59 +08:00
xieqiyu ae62bdff75 * Code for task#78661. 2022-12-07 14:19:36 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
liumengyi a6c8171286 * Fix bug #30278. 2022-12-01 10:33:59 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
Yagami 427d5947c5 * Fix bug #29443. 2022-11-18 14:41:25 +08:00
liumengyi 31f3e49602 * Fix bug #29911. 2022-11-17 15:05:37 +08:00
liumengyi 64ac87995c * Fix bug #29902. 2022-11-17 08:46:41 +08:00
liumengyi 398afed7ae * Fix bug #29912. 2022-11-17 08:42:54 +08:00
孙广明 3aedd173f8 Merge branch 'master_xieqiyu_29808' into 'master'
* Fix bug#29808.

See merge request easycorp/zentaopms!6165
2022-11-15 07:57:42 +00:00
xieqiyu 85c8e84c79 * Fix bug#29808. 2022-11-15 15:56:34 +08:00
mayue 127139f803 * Fix bug #29757. 2022-11-15 11:13:03 +08:00