Commit Graph
45516 Commits
Author SHA1 Message Date
曹延义 3f32ccdcb5 * Modify bug title. 2022-10-11 08:34:53 +08:00
guofeilong 3d563b958b * finish task 71875 2022-10-10 09:21:54 +00:00
guofeilong 150beef775 * finish task *71875 2022-10-10 02:51:03 +00:00
guofeilong ec2638b40c * finish task 71881 2022-10-10 01:05:48 +00:00
李玉春 635693bef4 Merge branch 'sprint/244_wzm_70007' into 'master'
* finish task 70007 & 71896

See merge request easycorp/zentaopms!5689
2022-10-10 00:56:52 +00:00
李玉春 58ca1c8187 Merge branch 'sprint/247_wzm_71878' into 'master'
* finish task 71878

See merge request easycorp/zentaopms!5691
2022-10-10 00:52:31 +00:00
李玉春 0e89d240c2 Merge branch 'cyy_optimize' into 'master'
* Optimize product page.

See merge request easycorp/zentaopms!5690
2022-10-10 00:51:28 +00:00
李玉春 412ef6d8cd Merge branch 'sprint/gfl_71882' into 'master'
Sprint/gfl 71882

See merge request easycorp/zentaopms!5688
2022-10-10 00:46:57 +00:00
曹延义 f559785539 * Optimize page style. 2022-10-09 17:08:21 +08:00
曹延义 3523d0b255 * Finish task #71892. 2022-10-09 17:01:01 +08:00
曹延义 5306bb29f9 * Modify page style. 2022-10-09 16:36:57 +08:00
孙广明 0e0b65b274 Merge branch 'sprint/scx_edituser' into 'master'
* Fix bug for api requests using json.

See merge request easycorp/zentaopms!5686
2022-10-09 08:27:11 +00:00
曹延义 205506a68a * Finish task #71891. 2022-10-09 16:14:17 +08:00
曹延义 b29d0f75c9 * Finish task #71894. 2022-10-09 15:54:13 +08:00
wangzemei f0c3b79018 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878 2022-10-09 15:42:16 +08:00
wangzemei ec7844f035 * compatible datatable style 2022-10-09 15:42:00 +08:00
曹延义 6b59d194fb * Optimize product page. 2022-10-09 15:38:30 +08:00
wangzemei 4a656cf175 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 15:19:48 +08:00
wangzemei c5c38c98bf * modify style cover 2022-10-09 15:18:39 +08:00
guofeilong 9aeba19381 * add pd-r-8 to column c-hours th 2022-10-09 06:56:38 +00:00
李玉春 7f1d674a73 Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
2022-10-09 06:50:04 +00:00
曹延义 dc6b265503 * Adjust codes. 2022-10-09 14:48:37 +08:00
曹延义 0b55fb4095 * Adjust code. 2022-10-09 14:27:50 +08:00
李玉春 b97d8e322c Merge branch 'sprint/gfl_71880' into 'master'
* finish taks #71880

See merge request easycorp/zentaopms!5682
2022-10-09 06:25:58 +00:00
宋辰轩 05b8fa3317 * Fix bug for api requests using json. 2022-10-09 14:12:51 +08:00
guofeilong 13135a581f * finish task 71882 2022-10-09 05:28:58 +00:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
guofeilong 768f157701 * finish taks #71880 2022-10-09 05:21:53 +00:00
王怡栋 6de1261aa9 Merge branch 'bug_28284' into 'master'
* Fix bug#28284

See merge request easycorp/zentaopms!5681
2022-10-09 05:13:24 +00:00
王怡栋 c4b0ea226e Merge branch 'bug_28268' into 'master'
* Fix bug#28268

See merge request easycorp/zentaopms!5673
2022-10-09 05:10:54 +00:00
王怡栋 7e3bd18704 Merge branch 'sprint/hufangzhou_bug_28265' into 'master'
* Fix bug #28265.

See merge request easycorp/zentaopms!5666
2022-10-09 05:10:25 +00:00
王怡栋 449f6ec5c4 Merge branch 'master_xieqiyu_26061' into 'master'
* Fix bug#26061.

See merge request easycorp/zentaopms!5660
2022-10-09 05:09:42 +00:00
王怡栋 05d4c462a7 Merge branch 'master_28214' into 'master'
*Fix bug #28214.

See merge request easycorp/zentaopms!5659
2022-10-09 05:09:28 +00:00
王怡栋 1f68a6b1e7 Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.

See merge request easycorp/zentaopms!5658
2022-10-09 05:08:34 +00:00
王怡栋 83d7911269 Merge branch 'sprint/gfl_71907' into 'master'
* finish task #71907

See merge request easycorp/zentaopms!5677
2022-10-09 05:08:02 +00:00
zenggang af225c1284 * Fix bug#28284 2022-10-09 03:27:18 +00:00
曹延义 84e1f0295d * Code for task #71876. 2022-10-09 11:15:44 +08:00
guofeilong 7fa0485534 * finish task #71907 2022-10-09 02:52:47 +00:00
wangyidong 460c3d9fb1 * adjust for ztSessionHandler. 2022-10-09 10:41:14 +08:00
李玉春 235739d5d0 Merge branch 'sprint/cyy_71886' into 'master'
* Finish task #71886.

See merge request easycorp/zentaopms!5675
2022-10-09 02:27:56 +00:00
曹延义 bff2bdcbb3 * Finish task #71877. 2022-10-09 10:07:41 +08:00
wangzemei ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
wangzemei 3f067a412e * remove empty lines 2022-10-09 09:47:10 +08:00
wangzemei 8d0988d465 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 09:43:24 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
曹延义 dbd87ebfd3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_71886 2022-10-09 09:36:33 +08:00
曹延义 162c12800b * Finish task #71886. 2022-10-09 09:36:13 +08:00
李玉春 5ca7ebfadc Merge branch 'cyy_71909' into 'master'
Cyy 71909

See merge request easycorp/zentaopms!5674
2022-10-09 00:26:46 +00:00
曹延义 a923a0838d * Finish task #71884. 2022-10-08 17:21:29 +08:00
曹延义 9e7e1f6969 * Finish task #71906. 2022-10-08 17:17:42 +08:00