Commit Graph
135 Commits
Author SHA1 Message Date
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 72200617d3 * Finish task #58576. 2022-06-28 00:57:01 +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 f6c4b3adb1 * Finish task #56908. 2022-06-13 07:59:29 +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
songchenxuan b4a5b7bff2 *Translate. 2022-02-24 16:52:16 +08:00
songchenxuan 66bbe4cfbe *Translate. 2022-02-24 16:31:58 +08:00
zhengrunyu b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
reneeteng cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
dingna 27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
王怡栋 d2403a6b8e * add new version and upgrade. 2021-09-08 16:00:42 +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
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 5e371ace2d * add new version and upgrade. 2021-06-12 15:46:12 +08:00
sgm0422 7391916108 * Add en lang. 2021-04-02 21:01:35 +08:00
tianshujie98 29cb438eb7 * Modify language format. 2021-04-01 13:50:20 +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
zhujinyong 8749c2983d Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-18 16:19:35 +08:00
tianshujie98 0afece207e * Fix project batch editing problem. 2021-03-12 09:02:41 +08:00
zhujinyong 38cbc02c95 * Fix lang of project and program. 2021-03-04 15:45:53 +08:00
Yagami 76cb3cee0b * Divide program/project/execution. 2021-03-03 17:45:28 +08:00
tianshujie98 8a7d17e851 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-03-03 09:41:59 +08:00
tianshujie98 0d11a4dca3 * Finish task #36375. 2021-03-03 09:41:35 +08:00
qiyu-xie 76a08d3b34 * Finish task#36328. 2021-03-03 08:34:00 +08:00
qiyu-xie 0944ebb9bf * Add other language items for budget unit. 2021-03-01 08:18:20 +08:00
tianshujie98 d4d819073a * Finish task #36019. 2021-02-22 14:07:16 +08:00
tianshujie98 1b173f6f0d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-02-20 16:02:03 +08:00
tianshujie98 8212de6cc3 * Modify the logic of project editing. 2021-02-20 15:57:10 +08:00