Commit Graph
202 Commits
Author SHA1 Message Date
zhouxudong b058344542 * Fix bug #26612. 2022-08-19 03:07:13 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong 0091ac82c6 * Update. 2022-08-05 08:16:11 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
wangyuting2 fa81472771 * Adjust menu. 2022-08-03 13:32:41 +08:00
zhouxudong 535922b47c * Finish task #62852. 2022-08-02 09:36:54 +00:00
zhouxudong 8486aba922 * Finish task #62852. 2022-08-02 05:51:49 +00:00
hufangzhou 9bfb42cffd * Add the new version. 2022-07-27 15:01:41 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
zhouxudong 298493d3a1 * Fix bug #24417. 2022-06-30 00:57:18 +00:00
zhouxudong 461235a048 * Fix bug #24417. 2022-06-29 09:00:33 +00:00
liumengyi 3dda133a92 * Finish task #58561. 2022-06-28 11:08:30 +08:00
王怡栋 2a82c6a6a1 Merge branch 'sprint/master_zhouxudong_58576' into 'master'
Sprint/master zhouxudong 58576

See merge request easycorp/zentaopms!4163
2022-06-28 01:05:10 +00:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
zhouxudong 69b87ae29f * Fix bug #24368. 2022-06-27 03:20:49 +00:00
zhouxudong 463b4d0710 * Finish task #57859. 2022-06-24 02:14:08 +00:00
zhouxudong 483ecf2847 * Finish task #56908. 2022-06-13 08:01:10 +00:00
zhouxudong f6c4b3adb1 * Finish task #56908. 2022-06-13 07:59:29 +00:00
zhouxudong 9743e0031b * Finish task #56908. 2022-06-13 07:46:52 +00:00
zhouxudong d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
zhouxudong 5b33b75d41 * Finish task #54476 #54475 #54474. 2022-05-18 10:18:02 +00:00
wangyidong 759ace3700 * code for task #54026. 2022-05-16 16:36:04 +08:00
孙广明 10a542cc35 Merge branch 'sprint/189_zenggang' into 'master'
* Fix bugs

See merge request easycorp/zentaopms!3374
2022-05-13 01:57:36 +00:00
zenggang e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
zenggang b5093f3a1b * Code for task#53657 2022-05-11 08:32:50 +00:00
zenggang d8d6ce45f7 * Finish task#53653 2022-05-10 08:58:00 +00:00
dingna 27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
tianshujie e64147cfc1 * Finish task #41574. 2021-08-26 17:32:17 +08:00
孙广明 4b230745c1 * Code for task #41775. 2021-08-26 15:45:59 +08:00
孙广明 cf06d1f24f * Code for task #41775. 2021-08-25 15:54:15 +08:00
wangyidong fd8d02c7df * add new version and upgrade. 2021-08-04 14:18:09 +08:00
tianshujie98 d83bb8b852 * Finish task #40843. 2021-08-03 10:55:39 +08:00
tianshujie98 4ef9020331 * Finish task #40838. 2021-08-03 10:14:12 +08:00
wangyidong bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
tianshujie98 6cf5b67feb * Add format judgment to the exchange rate. 2021-08-02 09:01:11 +08:00
tianshujie98 e67b31f6a9 * Fix bug #13927. 2021-07-30 10:26:35 +08:00
wangyidong 8d37af5669 * code for task #40451. 2021-07-28 17:49:03 +08:00
wangyidong 4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00
tianshujie98 29cb438eb7 * Modify language format. 2021-04-01 13:50:20 +08:00
holan20180123 59ef112709 * Finish task #37013. 2021-04-01 13:22:03 +08:00
wangyidong 34347209e9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:53:37 +08:00
wangyidong 5e98a02375 * finish task #36745. 2021-03-30 16:41:22 +08:00
holan20180123 eb73c2f8fc * Finish task #37098. 2021-03-30 15:08:47 +08:00
tianshujie98 000db1c636 * Fix bug #11203. 2021-03-29 20:39:41 +08:00
zhujinyong 2d68f7dd45 * Fix dynamic bug. 2021-03-24 18:06:47 +08:00
zhujinyong 1f780be529 * Fix actions of program module. 2021-03-24 15:26:45 +08:00
holan20180123 642e2bd597 * Fix bug #11262. 2021-03-22 10:01:38 +08:00