Commit Graph
47035 Commits
Author SHA1 Message Date
daitingting 219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
wangyidong 4a9e97b29c * code for task #73991. 2022-11-01 13:28:56 +08:00
wangyidong 9cd542f3c7 * code for task #73987. 2022-11-01 12:10:37 +08:00
wangyidong 40e20fa112 * code for task #74178. 2022-11-01 10:22:13 +08:00
wangyidong 3a8ef27bec * code for task #73993. 2022-11-01 08:45:15 +08:00
王怡栋 b04efbf36c Merge branch 'zentaopms_239_task_#73990' into 'zentaopms_239'
* Finish task #73989, #73990.

See merge request easycorp/zentaopms!5953
2022-10-31 07:19:32 +00:00
王怡栋 2d249ae8c5 Merge branch 'zentaopms_239_wyd' into 'zentaopms_239'
* code for task #74183,74184,74185.

See merge request easycorp/zentaopms!5954
2022-10-31 07:19:01 +00:00
daitingting 16706253e7 * Finish task #73989, #73990. 2022-10-31 06:27:40 +00:00
wangyidong f9ec235880 * code for task #74183,74184,74185. 2022-10-31 14:20:48 +08:00
王怡栋 175a8102e0 Merge branch 'zentaopms_239_task#74156' into 'zentaopms_239'
* Finish task #74156.

See merge request easycorp/zentaopms!5948
2022-10-31 06:19:10 +00:00
wangyuting2 95a2e3da68 * Finish task #73828. 2022-10-31 06:08:56 +00:00
王怡栋 1c8a04527c Merge branch 'zentaopms_239_task_#74179' into 'zentaopms_239'
* Finish task #74179.

See merge request easycorp/zentaopms!5949
2022-10-31 06:04:54 +00:00
王怡栋 534dea4c8c Merge branch 'zentaopms_239_task_#74159' into 'zentaopms_239'
* Finish task #74159.

See merge request easycorp/zentaopms!5951
2022-10-31 06:04:24 +00:00
daitingting a1cf2ccdf8 * Finish task #74159. 2022-10-31 05:56:40 +00:00
王怡栋 7ff8c82cc3 Merge branch 'zentaopms_239_bug_#29073' into 'zentaopms_239'
* Fix bug #29073.

See merge request easycorp/zentaopms!5941
2022-10-31 05:56:08 +00:00
王怡栋 116913fdc8 Merge branch 'zentaopms_239_bug_#28966' into 'zentaopms_239'
* Fix bug #28966.

See merge request easycorp/zentaopms!5939
2022-10-31 05:42:31 +00:00
daitingting 47db9c31e3 * Finish task #74179. 2022-10-31 05:19:20 +00:00
wangyidong 7dee092c08 * code for task #74177. 2022-10-31 13:08:57 +08:00
wangyuting2 7c4c04938b * Finish task #74156. 2022-10-31 05:04:57 +00:00
daitingting 6a2200647e * Fix bug #29073. 2022-10-28 09:08:37 +00:00
daitingting dc4940c39d * Fix bug #28966. 2022-10-28 08:11:24 +00:00
王 于听 6e50e57805 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Optimize code.

See merge request easycorp/zentaopms!5937
2022-10-28 08:06:08 +00:00
wangyuting2 b7ebe4ee2b * Optimize code. 2022-10-28 08:05:21 +00:00
wangyidong 7050943933 * fix bug #29017. 2022-10-28 15:25:17 +08:00
王怡栋 eac8590153 Merge branch 'zentaopms_239_bug_#28928' into 'zentaopms_239'
* Fix bug #28928, #28930.

See merge request easycorp/zentaopms!5933
2022-10-28 07:05:42 +00:00
王怡栋 6dd72b710a Merge branch 'zentaopms_239_task#73819' into 'zentaopms_239'
* Finish task #73819.

See merge request easycorp/zentaopms!5920
2022-10-28 07:04:40 +00:00
daitingting 0bacaf044c * Fix bug #28928, #28930. 2022-10-28 06:09:33 +00:00
wangyidong d1f11b72d8 * fix bug #29065. 2022-10-28 14:08:53 +08:00
wangyuting2 b48e275bcd * Optimize code. 2022-10-28 05:13:54 +00:00
wangyidong 9f18188062 * fix bug #29062. 2022-10-28 13:13:01 +08:00
wangyidong 1b5bb99103 * code for task #29090. 2022-10-28 11:23:22 +08:00
wangyidong cabc10ad73 * code for task #73474. 2022-10-28 10:50:57 +08:00
王 于听 233ccd4525 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix bug for php56.

See merge request easycorp/zentaopms!5922
2022-10-27 08:26:12 +00:00
wangyuting2 64b19e32a6 * Fix bug for php56. 2022-10-27 08:25:14 +00:00
王 于听 a468223eff Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Set config.

See merge request easycorp/zentaopms!5921
2022-10-27 08:19:34 +00:00
wangyuting2 cca2157511 * Set config. 2022-10-27 08:16:39 +00:00
wangyuting2 f61479fe2d * Finish task #73819. 2022-10-27 07:39:29 +00:00
王 于听 46aafd792c Merge branch 'zentaopms_239_task#73818' into 'zentaopms_239'
* Finish task #73818.

See merge request easycorp/zentaopms!5918
2022-10-27 06:47:19 +00:00
wangyuting2 fc95cc66a0 * Optimize code. 2022-10-27 06:46:57 +00:00
王怡栋 38155947ff Merge branch 'zentaopms_239_task_#72756' into 'zentaopms_239'
* Finish task #72756.

See merge request easycorp/zentaopms!5910
2022-10-27 06:45:31 +00:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
王 于听 d6ad51dbb3 Merge branch 'zentaopms_239_task#73814' into 'zentaopms_239'
* Finish task #73814.

See merge request easycorp/zentaopms!5917
2022-10-27 06:42:27 +00:00
daitingting c338b9a237 * Adjust codes. 2022-10-27 06:30:12 +00:00
wangyuting2 5467991e67 * Finish task #73814. 2022-10-27 06:10:54 +00:00
王怡栋 909e148115 Merge branch 'zentaopms_239_bug#28962' into 'zentaopms_239'
* Fix bug #28962.

See merge request easycorp/zentaopms!5904
2022-10-27 05:46:46 +00:00
王怡栋 c1db41db21 Merge branch 'zentaopms_239_task#28924' into 'zentaopms_239'
* Fix bug #28924.

See merge request easycorp/zentaopms!5902
2022-10-27 05:46:29 +00:00
daitingting 7727f1ee7b * Remove useless codes. 2022-10-27 05:21:14 +00:00
daitingting 4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong 132eb72a4d * adjust for my bug. 2022-10-27 11:46:28 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00