Commit Graph
426 Commits
Author SHA1 Message Date
liumengyi 3c053ada91 * Add english lang item. 2022-04-21 13:11:14 +08:00
liumengyi 80bbd19c9d * Fix bug #19143. 2022-04-21 13:00:36 +08:00
sunjun 8b96fe80bf *Fixbug_sunjun_21521 2022-04-11 14:00:16 +08:00
李玉春 a0c697e670 Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!2810
2022-04-08 01:13:44 +00:00
caoyanyi 4819b30292 * Fix bug #18018. 2022-04-07 16:50:05 +08:00
zenggang 6deba0c240 * Fix bug #21103,21176 2022-04-07 07:44:39 +00:00
Wenrui LI c3d025f199 * fix unable to reorder in dynamic view, bug #21046. 2022-03-25 11:05:46 +08:00
Wenrui LI c53d0c6295 * fix dynamic order select styles, task #51310, bug #20973. 2022-03-22 11:03:33 +08:00
王怡栋 3c1865c527 * adjust code for order by. 2022-03-14 17:28:14 +08:00
王怡栋 c1f3258a74 * adjust for get dynamic. 2022-03-14 16:08:58 +08:00
王怡栋 185ae2a4f8 * fix bug #20560. 2022-03-10 17:23:50 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
zhujinyong 5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
zhouxudong c7211f7164 *Fix bug #13636. 2022-02-14 16:50:33 +08:00
zhouxudong 5ec1d31b76 *Fix bug #13636. 2022-02-07 11:11:48 +08:00
tanghucheng 268fa200a9 * fix bug #19022. 2022-01-28 16:04:01 +08:00
tanghucheng 640dd2ce1b * Delete product for dynamic search. 2022-01-21 13:11:52 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
liyuchun 4bf49c5da7 * Finish task #47232. 2022-01-13 16:25:56 +08:00
liumengyi dc8da347b6 * Fix bug #18293. 2022-01-11 08:54:15 +08:00
hufangzhou 22f322fb94 * Fix bug #18220. 2022-01-05 20:47:05 +08:00
孙广明 c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
xieqiyu 5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
王怡栋 061bf4388c * adjust for unit test. 2021-12-30 10:08:00 +08:00
zhujinyong 45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
朱金勇 161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
liumengyi bba0c40dfe * Fix bug #16882, #16924. 2021-12-01 11:25:02 +08:00
liumengyi 569cc32446 * Fix bug #16924. 2021-11-30 14:59:49 +08:00
liumengyi 28e208cbcb * Fix bug #16924. 2021-11-30 14:53:23 +08:00
liumengyi 7dc88ef740 * Fix bug #16924. 2021-11-30 11:11:54 +08:00
liumengyi bd6a007e6a * Add comment. 2021-11-30 10:55:51 +08:00
liumengyi 62907853b4 * Finish task #45156. 2021-11-30 09:10:42 +08:00
liumengyi e9ead71632 * Finish task #45156. 2021-11-29 14:37:21 +08:00
liumengyi 7368ed108b * Finish task #45156. 2021-11-29 14:33:44 +08:00
liumengyi aa840c5b9b * Finish task #45156. 2021-11-29 14:33:12 +08:00
liumengyi 43c1b047b8 * Modify Date always in reverse order. 2021-11-29 13:43:04 +08:00
liumengyi ea4ee494de * Modify Date always in reverse order. 2021-11-29 13:37:27 +08:00
liumengyi adee5873ec * Modify Date always in reverse order. 2021-11-29 13:22:05 +08:00
liumengyi c854d353c6 * Modify Date always in reverse order. 2021-11-29 11:30:30 +08:00
liumengyi 0dcdc497a2 * Finish task #45156. 2021-11-29 08:37:47 +08:00
liumengyi 143dff6f0b * Finish task#45156. 2021-11-29 08:24:04 +08:00
liumengyi e4e040326b * Finish task #45156. 2021-11-26 14:01:11 +08:00
tianshujie 91f8db484c * Fix bug #15511. 2021-10-14 15:09:20 +08:00
hufangzhou bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
王怡栋 96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00
tianshujie 07bbef9251 * Modify language item. 2021-10-08 13:58:22 +08:00
朱金勇 98f93d563d Merge branch 'spirnt/165_tianshujie_42867' into 'sprint/165'
* Finish task #42867.

See merge request easycorp/zentaopms!28
2021-09-28 07:42:48 +00:00
tianshujie 353bef2e83 * Finish task #42867. 2021-09-28 15:38:34 +08:00