 孙广明
|
39d2a529b0
|
Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug
See merge request easycorp/zentaopms!4428
|
2022-07-08 02:46:11 +00:00 |
|
|
孙广明
|
df7787bbd1
|
Merge branch 'fixbug_createTask' into 'master'
Fixbug create task
See merge request easycorp/zentaopms!4427
|
2022-07-08 02:43:15 +00:00 |
|
|
sunjun
|
d2b201003b
|
fixbug
|
2022-07-08 02:37:29 +00:00 |
|
|
tianshujie
|
fe4b40e3cd
|
* Fix bug #24127.
|
2022-07-08 10:34:05 +08:00 |
|
|
王怡栋
|
272ba58696
|
Merge branch 'sprint/master_zhouxudong_59681' into 'master'
Sprint/master zhouxudong 59681
See merge request easycorp/zentaopms!4426
|
2022-07-08 02:09:05 +00:00 |
|
|
zhouxudong
|
7988466f2f
|
* Finish task #59681.
|
2022-07-08 02:07:45 +00:00 |
|
|
zhouxudong
|
e146c91ecb
|
＊ Finish task #59681.
|
2022-07-08 02:04:04 +00:00 |
|
|
sunjun
|
f7400480d4
|
fixbug_createTask
|
2022-07-08 02:02:22 +00:00 |
|
|
zhouxudong
|
85cecc60e5
|
* Finish task #59681.
|
2022-07-08 01:55:07 +00:00 |
|
|
zhouxudong
|
f8c7be2001
|
* Finish task #59681.
|
2022-07-08 01:47:03 +00:00 |
|
|
tanghucheng
|
a49f72e59c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-08 08:23:48 +08:00 |
|
|
刘刚
|
6d59cccaec
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24865.
See merge request easycorp/zentaopms!4419
|
2022-07-08 00:01:15 +00:00 |
|
|
liuruogu
|
63fe5c2750
|
* Fix bug #24865.
|
2022-07-07 09:23:56 +00:00 |
|
|
zhouxudong
|
e68d805486
|
* Finish task #59681.
|
2022-07-07 07:49:17 +00:00 |
|
|
zhouxudong
|
63128f6258
|
* Finish task #59681.
|
2022-07-07 05:36:28 +00:00 |
|
|
tanghucheng
|
e2cb73a383
|
* Fix initFieldList.
|
2022-07-07 12:02:48 +08:00 |
|
|
tanghucheng
|
2318fc65a2
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-07 12:02:32 +08:00 |
|
|
zhouxudong
|
28c6608986
|
* Finish task #59681.
|
2022-07-07 02:59:57 +00:00 |
|
|
孙广明
|
c540e7002d
|
Merge branch 'sprint/211_tianshujie_58555' into 'master'
Sprint/211 tianshujie 58555
See merge request easycorp/zentaopms!4392
|
2022-07-07 02:51:51 +00:00 |
|
|
tianshujie
|
5ccd62ea84
|
* Merge insensitive refresh custom forms into one method.
|
2022-07-07 10:44:29 +08:00 |
|
|
刘刚
|
ff94cac738
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24898.
See merge request easycorp/zentaopms!4399
|
2022-07-07 02:36:20 +00:00 |
|
|
daitingting
|
cfc20958d0
|
* Fix bug #24903.
|
2022-07-07 02:35:55 +00:00 |
|
|
tianshujie
|
40ca319394
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/211_tianshujie_58555
|
2022-07-07 09:41:09 +08:00 |
|
|
刘刚
|
52da827d60
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.
See merge request easycorp/zentaopms!4394
|
2022-07-07 01:23:55 +00:00 |
|
|
daitingting
|
3bdeeea0f0
|
* Fix bug #24908.
|
2022-07-07 01:12:48 +00:00 |
|
|
tianshujie
|
dc7e0ec546
|
* Put the functions that add and remove elements in my.full.js.
|
2022-07-06 16:37:10 +08:00 |
|
|
tanghucheng
|
9eeb2c64e6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-06 16:33:55 +08:00 |
|
|
tanghucheng
|
c7c198453c
|
* Finish simple export.
|
2022-07-06 16:33:33 +08:00 |
|
|
王怡栋
|
f25fcc1eb2
|
Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
# module/testcase/css/create.css
|
2022-07-06 06:47:25 +00:00 |
|
|
tanghucheng
|
eaf2ff65ed
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-06 14:36:13 +08:00 |
|
|
tanghucheng
|
b03afaebb3
|
* Code for export.
|
2022-07-06 14:35:09 +08:00 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
刘刚
|
d3174ab36c
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4368
|
2022-07-06 03:07:19 +00:00 |
|
|
liumengyi
|
6464887f89
|
* Fix bug #24753.
|
2022-07-06 08:42:21 +08:00 |
|
|
liumengyi
|
b5608fb799
|
* Fix bug #24754.
|
2022-07-06 08:41:51 +08:00 |
|
|
tianshujie
|
577b42f32c
|
* Hide required fields in custom forms.
|
2022-07-06 08:41:20 +08:00 |
|
|
tianshujie
|
cdaf164f0a
|
* Fix bug #24752,24747.
|
2022-07-06 08:26:27 +08:00 |
|
|
daitingting
|
be44e76cb9
|
* Finish task #59646.
|
2022-07-05 09:20:47 +00:00 |
|
|
王怡栋
|
bc00e9f66c
|
Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475
See merge request easycorp/zentaopms!4353
|
2022-07-05 08:30:47 +00:00 |
|
|
tianshujie
|
64c23417d0
|
* Modify style issues.
|
2022-07-05 16:05:33 +08:00 |
|
|
tianshujie
|
f186662f35
|
* Transfer variable.
|
2022-07-05 15:31:23 +08:00 |
|
|
zhouxudong
|
b9ee65ddfd
|
* Fix bug #24751.
|
2022-07-05 06:54:04 +00:00 |
|
|
tianshujie
|
4c4e67f7e8
|
* Finish task #59475.
|
2022-07-05 14:08:00 +08:00 |
|
|
tianshujie
|
1bae5b38d1
|
* Finish task #59472.
|
2022-07-05 14:00:34 +08:00 |
|
|
tianshujie
|
e29794271a
|
* Delete extra blank lines.
|
2022-07-05 13:19:56 +08:00 |
|
|
tianshujie
|
4e05cb1916
|
* Finish task #59472.
|
2022-07-05 13:19:03 +08:00 |
|
|
王怡栋
|
a6916a73c5
|
Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527
See merge request easycorp/zentaopms!4326
|
2022-07-05 02:07:26 +00:00 |
|
|
王怡栋
|
db007fe5eb
|
Merge branch 'sprint/211_tianshujie_59472' into 'master'
Sprint/211 tianshujie 59472
See merge request easycorp/zentaopms!4327
|
2022-07-05 01:54:17 +00:00 |
|
|
tianshujie
|
17a8e9dcd5
|
* Changing the name of a function.
|
2022-07-05 08:47:45 +08:00 |
|
|
tianshujie
|
21d8a543a4
|
* Fix bug #24721.
|
2022-07-04 17:20:35 +08:00 |
|