Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
43,283 Commits 2 Branches 292 Tags
402d439ee00233b2ab4d8145c9bb43b18dfa0165
Commit Graph
479 Commits
Author SHA1 Message Date
王怡栋 0f9f37e882 Merge branch 'sprint/devplat_30' into 'master' 
* Set the value is empty if the value is not setted.

See merge request easycorp/zentaopms!4786
 2022-08-04 03:26:55 +00:00
daitingting c5036c1b55 * Set the value is empty if the value is not setted. 2022-08-04 03:22:07 +00:00
wangyidong f5b6edef01 Merge branch 'sprint/devplat_30' 2022-08-04 09:13:53 +08:00
wangyuting2 4b65421dbe * Fix lang is not defind bug. 2022-08-03 13:47:05 +08:00
daitingting 8619b4c5a9 * Fix bug #25922. 2022-08-03 01:53:35 +00:00
wangyidong 99c5aab19a * code for task #62739. 2022-08-02 16:18:38 +08:00
zhouxudong 3cb2736d3b * Finish task #61909. 2022-07-26 01:39:05 +00:00
zhouxudong 9dd747147f * Finish task #61909. 2022-07-25 05:10:38 +00:00
zhouxudong 272aaed0a9 * Finish task #61909. 2022-07-25 03:17:42 +00:00
zhouxudong da232983e5 * Finish task #61110. 2022-07-19 03:06:00 +00:00
leiyong ce8d8d25eb * Adjust icon. 2022-07-11 08:55:21 +00:00
leiyong f303003a12 * Delete icon. 2022-07-08 07:35:20 +00:00
leiyong b7074c0ec0 * Adjust CSS. 2022-07-08 01:58:21 +00:00
leiyong ea75f32195 * Adjsut CSS. 2022-07-08 01:46:15 +00:00
王怡栋 e7502f6641 Merge branch 'master' into 'sprint212_leiyong_task_59528' 
# Conflicts:
#   module/execution/css/create.css
 2022-07-07 01:38:20 +00:00
wangyidong 16663dee7f * fix bug #24818. 2022-07-06 17:17:28 +08:00
lanzongjun d6a387935f * fix bug #24813 2022-07-06 14:44:36 +08:00
lanzongjun 5f468b66a7 test 2022-07-06 11:28:47 +08:00
lanzongjun a7410f7986 * fix bug #24806-2 2022-07-06 11:23:31 +08:00
lanzongjun 42e8032269 * fix bug #24806-2 2022-07-06 11:20:32 +08:00
lanzongjun 4fd0e3bcfe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-07-06 11:16:01 +08:00
lanzongjun fbc4db545c * fix bug #24806 2022-07-06 11:07:39 +08:00
wangyidong 18c2a6e80e * code for bug #24758. 2022-07-05 16:57:34 +08:00
leiyong cf9d677ffa * Finish task#59528. 2022-07-05 08:08:17 +00:00
liumengyi 1c13ccd0ba * Fix bug #24659. 2022-07-01 10:05:33 +08:00
zhouxudong 502e3db733 * Iframe and disable will be invalid. 2022-06-30 08:35:22 +00:00
liumengyi afa237c3ac * Fix bug #23250. 2022-06-30 13:03:04 +08:00
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +08:00
zhujinyong b8189edbf7 Merge branch 'sprint/sunhao/picker' 2022-06-15 17:53:37 +08:00
xieqiyu ac34aaa200 * Finish task#56930,56929,56928. 2022-06-15 16:23:06 +08:00
liyuchun 9c675ceb6b * Fix error. 2022-06-15 08:12:42 +00:00
xieqiyu e96fff70a3 * Finish task#56930,56929,56928. 2022-06-15 15:56:34 +08:00
xieqiyu 58e7a4ff19 * Finish task#56930,56929,56928. 2022-06-15 15:32:33 +08:00
liumengyi cb8dc6954c * Optimize code for bug #23581. 2022-06-13 10:07:34 +08:00
liumengyi a48a3614aa * Fix bug #23581. 2022-06-13 08:08:30 +08:00
tianshujie 505a843518 Resolve issue #674. 2022-06-10 16:24:45 +08:00
tianshujie e5fd340b73 * Resolve issue #674. 2022-06-10 16:19:23 +08:00
tianshujie 5dff5c5eb4 * Resolve issue #674. 2022-06-10 16:01:51 +08:00
liumengyi 311b1d251e * Fix bug #23561. 2022-06-10 11:45:07 +08:00
liumengyi aa777c65d3 * Fix bug #23561. 2022-06-10 11:42:02 +08:00
liumengyi c6eb7aaff0 * Fix bug #23423. 2022-06-10 11:08:43 +08:00
liumengyi 0386e08d52 * Fix bug #23423. 2022-06-10 10:16:54 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
zenggang ef4c0d9849 * Fix bug#22471 2022-05-16 02:46:27 +00:00
孙广明 234baf4594 Merge branch 'liyuchun_fixbug_22098' into 'master' 
* Fix bug #21887.

See merge request easycorp/zentaopms!3222
 2022-04-29 07:12:02 +00:00
liyuchun d1afd5983d * Delete unused code. 2022-04-29 06:57:57 +00:00
liyuchun a9223eac92 * Delete unused code. 2022-04-29 06:57:13 +00:00
liyuchun a0f8bda990 * Fix bug #21887. 2022-04-29 06:56:02 +00:00
孙广明 9d5cbd6c66 Merge branch 'liyuchun_fixbug_22098' into 'master' 
Liyuchun fixbug 22098

See merge request easycorp/zentaopms!3211
 2022-04-29 02:31:26 +00:00