Commit Graph
45540 Commits
Author SHA1 Message Date
tianshujie f4e39b358d * Finish task #71905. 2022-10-10 14:19:11 +08:00
tianshujie 4e772cc5bf * Adjust lang of release. 2022-10-10 14:15:06 +08:00
tianshujie 531f5d2cb8 * Finish task #71905. 2022-10-10 14:14:55 +08:00
tianshujie f080000984 * Finish task #71905. 2022-10-10 14:14:33 +08:00
王怡栋 0b569126ea Merge branch 'master_26245' into 'master'
* The execution logic to which the update task belongs when it is newly created.

See merge request easycorp/zentaopms!5680
2022-10-10 03:13:59 +00:00
liuhong 7571484ba7 *Adjust code for bug #26245. 2022-10-10 03:11:30 +00:00
李玉春 aff554786d Merge branch 'dht_unittest' into 'master'
* Add repo create unittest.

See merge request easycorp/zentaopms!5699
2022-10-10 03:05:13 +00:00
王怡栋 d9522cec75 Merge branch 'feedback_420' into 'master'
*Fix feedback #420.

See merge request easycorp/zentaopms!5676
2022-10-10 03:04:49 +00:00
王怡栋 6db31d7f33 Merge branch 'leiyong_merge_code' into 'master'
* Merge code.

See merge request easycorp/zentaopms!5697
2022-10-10 03:02:56 +00:00
denghongtao 24cad9ceda * Fix checkpriv and create unittest. 2022-10-10 03:00:41 +00:00
李玉春 de1dce1ff7 Merge branch 'sprint/247_wzm_71897' into 'master'
* finish task #71897

See merge request easycorp/zentaopms!5696
2022-10-10 02:34:25 +00:00
wangzemei 772395f377 * rm .swp 2022-10-10 10:28:50 +08:00
wangzemei 3f980942cb * modify lines 2022-10-10 10:27:13 +08:00
wangzemei 46e1408109 * modify privateNum 2022-10-10 10:08:38 +08:00
denghongtao 01fac13aee * Fix unittest note. 2022-10-10 02:04:59 +00:00
denghongtao f95cedc085 * Add repo create unittest. 2022-10-10 01:45:57 +00:00
wangzemei 209e38775d * rm class 2022-10-10 09:32:56 +08:00
leiyong bd612c2e64 * Merge code. 2022-10-10 01:28:39 +00:00
wangzemei ac21d1a69f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71897 2022-10-10 09:23:23 +08:00
wangzemei 383389a42a * add a colon 2022-10-10 09:23:15 +08:00
李玉春 a64b760da6 Merge branch 'sprint/247_wzm_71898' into 'master'
* finish task 71898

See merge request easycorp/zentaopms!5692
2022-10-10 01:03:29 +00:00
wangzemei ebb21c3ad4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71898 2022-10-10 09:02:21 +08:00
wangzemei 2a2e17b0e2 * remove not empty check 2022-10-10 09:02:10 +08: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
wangzemei 6ea3c948a5 * finish task #71897 2022-10-09 17:23:05 +08: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 6b0e072793 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71898 2022-10-09 15:45:21 +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