 王怡栋
|
7c1d105f9e
|
Merge branch 'sprint/zentaobiz12_ticket' into 'master'
fix bug guide
See merge request easycorp/zentaopms!5859
|
2022-10-21 08:15:04 +00:00 |
|
|
lanzongjun
|
da3f54870d
|
fix bug guide
|
2022-10-21 16:13:38 +08:00 |
|
|
xieqiyu
|
6731c7d6cb
|
* Fix bug#26119.
|
2022-10-21 15:40:36 +00:00 |
|
|
tanghucheng
|
9f93959a3f
|
* Fix bug .
|
2022-10-21 11:12:55 +08:00 |
|
|
wangzemei
|
5233ec969c
|
* Solved the problem of calculating the width of the table header
|
2022-10-20 08:58:49 +08:00 |
|
|
wangzemei
|
84f1b64aae
|
* remove useless class
|
2022-10-19 14:35:12 +08:00 |
|
|
wangzemei
|
25f8023fef
|
* Solve width calculation problems
|
2022-10-19 14:31:55 +08:00 |
|
|
hufangzhou
|
10c07b964f
|
* Added empty row for alignment.
|
2022-10-19 06:06:26 +00:00 |
|
|
王怡栋
|
cdb458bb9f
|
Merge branch 'master_feedback_1133' into 'master'
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.
See merge request easycorp/zentaopms!5796
|
2022-10-19 05:29:12 +00:00 |
|
|
liuhong
|
db48df1bb5
|
*Fix feedback #1133 for waterfall project choose stagefilteri with Related pages.
|
2022-10-19 05:09:01 +00:00 |
|
|
wangzemei
|
68f702d9ef
|
* fix 28395 28640 28406
|
2022-10-19 11:07:04 +08:00 |
|
|
tanghucheng
|
484cffa1a1
|
* Add ticket module.
|
2022-10-19 09:33:26 +08:00 |
|
|
tanghucheng
|
6c063505d6
|
Merge branch 'master' into tanghucheng_feedback_module
|
2022-10-18 15:33:45 +08:00 |
|
|
tanghucheng
|
ccd017af47
|
* Finish task #72201,72130,72129.
|
2022-10-18 15:04:35 +08:00 |
|
|
lanzongjun
|
aa6546a2ee
|
resolve conflict
|
2022-10-18 09:26:14 +08:00 |
|
|
tanghucheng
|
2d0901b36c
|
* Add top menu for feedback.
|
2022-10-15 08:52:40 +08:00 |
|
|
wangzemei
|
6aad1dacac
|
* Fix the problem that the button is not shown
|
2022-10-14 14:57:17 +08:00 |
|
|
李玉春
|
8624143bcc
|
Merge branch 'cyy_app' into 'master'
* Add user info data return.
See merge request easycorp/zentaopms!5737
|
2022-10-13 00:58:13 +00:00 |
|
|
李玉春
|
3de060e49b
|
Merge branch 'sprint/gfl_28333' into 'master'
Sprint/gfl 28333
See merge request easycorp/zentaopms!5732
|
2022-10-13 00:56:21 +00:00 |
|
|
李玉春
|
1b90b9c82c
|
Merge branch 'sprint/247_wzm_important' into 'master'
* fix bug 28395 && change important theme color
See merge request easycorp/zentaopms!5731
|
2022-10-13 00:53:30 +00:00 |
|
|
曹延义
|
4a1cb6551b
|
* Fix bug #28
52.#
|
2022-10-12 15:45:02 +08:00 |
|
|
guofeilong
|
4bbf5fa371
|
* fix bug #28333
|
2022-10-11 08:54:36 +00:00 |
|
|
wangzemei
|
01a12c95d9
|
* fix bug #283950
|
2022-10-11 16:42:59 +08:00 |
|
|
tianshujie
|
e9eb4fe0c7
|
* Fix bug #28436.
|
2022-10-11 16:11:34 +08:00 |
|
|
tianshujie
|
875ac851b4
|
* Fix bug #28460.
|
2022-10-11 15:07:12 +08:00 |
|
|
李玉春
|
30238c658f
|
Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888
See merge request easycorp/zentaopms!5723
|
2022-10-11 06:51:55 +00:00 |
|
|
tianshujie
|
d29c43fef1
|
* Fix bug #28436.
|
2022-10-11 14:29:43 +08:00 |
|
|
wangzemei
|
740e144707
|
* fix bug 28388 && 28395
|
2022-10-11 14:05:33 +08:00 |
|
|
guofeilong
|
11bf0dc557
|
* fix bug *28333
|
2022-10-11 02:54:35 +00:00 |
|
|
wangyidong
|
91ae21caec
|
Merge branch 'master' into sprint/feedback_module
|
2022-10-11 09:33:25 +08:00 |
|
|
tianshujie
|
fa4b34d58f
|
* Delete unnecessary Spaces.
|
2022-10-10 16:39:54 +08:00 |
|
|
tianshujie
|
e6082de4f4
|
* Finish task #71905.
|
2022-10-10 14:56:42 +08:00 |
|
|
曹延义
|
f559785539
|
* Optimize page style.
|
2022-10-09 17:08:21 +08:00 |
|
|
曹延义
|
6b59d194fb
|
* Optimize product page.
|
2022-10-09 15:38:30 +08:00 |
|
|
曹延义
|
9e7e1f6969
|
* Finish task #71906.
|
2022-10-08 17:17:42 +08:00 |
|
|
liyuchun
|
fbb492f4a5
|
Merge branch 'sprint/244_dyl_70022'
|
2022-10-08 10:56:08 +08:00 |
|
|
dingyongliang
|
61a485590e
|
* change nest toggle position.
|
2022-09-30 08:05:04 +00:00 |
|
|
王怡栋
|
49a416c70c
|
Merge branch 'master_28189' into 'master'
*Fix bug #28189.
See merge request easycorp/zentaopms!5643
|
2022-09-30 05:59:20 +00:00 |
|
|
liuhong
|
19e848e0fe
|
*Fix bug #28189.
|
2022-09-30 03:01:14 +00:00 |
|
|
lanzongjun
|
2a7b35764f
|
* modify db
|
2022-09-30 10:16:57 +08:00 |
|
|
曹延义
|
e1212f0160
|
* Fix bug #28201.
|
2022-09-30 09:58:11 +08:00 |
|
|
tianshujie
|
cc5e5d3c1d
|
* Fix bug #28192.
|
2022-09-29 18:06:12 +08:00 |
|
|
曹延义
|
05a255653b
|
* Code for bug #28153.
|
2022-09-29 11:00:37 +08:00 |
|
|
曹延义
|
885121c725
|
* Modify classic model style.
|
2022-09-29 10:27:45 +08:00 |
|
|
曹延义
|
feb98f882c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug
|
2022-09-29 09:16:40 +08:00 |
|
|
曹延义
|
94df83c6a1
|
* Add js comment.
|
2022-09-29 09:13:07 +08:00 |
|
|
李玉春
|
befe790a5f
|
Merge branch 'sprint/244_tianshujie_70482' into 'sprint/244'
Sprint/244 tianshujie 70482
See merge request easycorp/zentaopms!5600
|
2022-09-29 01:08:46 +00:00 |
|
|
曹延义
|
e363bb4ef9
|
Merge branch 'sprint/244' into sprint/244_wangzemei_70009
|
2022-09-28 15:19:58 +08:00 |
|
|
tianshujie
|
51fb885b08
|
* Finish task #70482.
|
2022-09-28 15:10:49 +08:00 |
|
|
曹延义
|
d231cad850
|
* Modify batch edit style.
|
2022-09-28 14:32:19 +08:00 |
|