 tianshujie
|
c2c7cf380a
|
* Fix bug #34722.
|
2023-04-24 18:17:49 +08:00 |
|
|
tianshujie
|
26b8880ba5
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 16:35:51 +08:00 |
|
|
tianshujie
|
cc256db992
|
* Fix bug #34710.
|
2023-04-24 16:35:36 +08:00 |
|
|
liumengyi
|
f8b23f567c
|
* Fix bug #34711.
|
2023-04-24 16:21:42 +08:00 |
|
|
tianshujie
|
9b0ed2a7bf
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 16:07:35 +08:00 |
|
|
tianshujie
|
000c800196
|
* Fix bug #34702.
|
2023-04-24 16:07:21 +08:00 |
|
|
赵珂
|
1c5516d4bf
|
Merge pull request 'zenops_69' (#10) from zenops_69 into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/10
|
2023-04-24 16:00:20 +08:00 |
|
|
zhaoke
|
ace0416ea3
|
* Adjust testcase for php5.3.
|
2023-04-24 15:53:11 +08:00 |
|
|
tianshujie
|
5cb292635a
|
* Fix bug #34691.
|
2023-04-24 15:51:40 +08:00 |
|
|
liumengyi
|
e5dfb8bd9d
|
* Fix bug #34644.
|
2023-04-24 15:44:57 +08:00 |
|
|
hufangzhou
|
611a8a3eff
|
* Modify the package view is default manage priv view.
|
2023-04-24 15:31:47 +08:00 |
|
|
wangyidong
|
466da04eac
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 15:18:32 +08:00 |
|
|
宋辰轩
|
af2eff9197
|
Merge pull request 'sprint/scx_bug34583' (#5) from sprint/scx_bug34583 into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/5
|
2023-04-24 15:09:15 +08:00 |
|
|
宋辰轩
|
837cc4de56
|
Merge pull request '* Fix bug for annualData, if have no dept, show empty.' (#6) from 184 into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/6
|
2023-04-24 15:08:15 +08:00 |
|
|
hufangzhou
|
130c2e8a84
|
* Change the xuanxuan commit.
|
2023-04-24 14:55:32 +08:00 |
|
|
tianshujie
|
f69507ab2e
|
* Fix bug #34684.
|
2023-04-24 14:42:45 +08:00 |
|
|
tianshujie
|
e1cff545d6
|
* Fix bug #34676.
|
2023-04-24 14:31:31 +08:00 |
|
|
tianshujie
|
831932222b
|
* Fix bug #34676.
|
2023-04-24 14:24:59 +08:00 |
|
|
宋辰轩
|
20c96cc1b9
|
* Fix bug for annualData, if have no dept, show empty.
|
2023-04-24 13:59:24 +08:00 |
|
|
tianshujie
|
cea07f16b6
|
* Fix bug #34671.
|
2023-04-24 13:48:24 +08:00 |
|
|
宋辰轩
|
3a0195009c
|
* Modify dom.
|
2023-04-24 13:39:22 +08:00 |
|
|
宋辰轩
|
b013c400c8
|
* Fix bug #34583.
|
2023-04-24 13:34:18 +08:00 |
|
|
tianshujie
|
1a5321ee1a
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 11:27:38 +08:00 |
|
|
tianshujie
|
03d8023952
|
* Fix bug #34654.
|
2023-04-24 11:27:26 +08:00 |
|
|
xieqiyu
|
7527b808bb
|
* Code for bug#34621.
|
2023-04-24 02:01:32 +00:00 |
|
|
liugang
|
c060a26fcd
|
* Fix sql error.
|
2023-04-24 01:44:35 +00:00 |
|
|
tianshujie
|
4f7be5c494
|
* Modifying SQL errors.
|
2023-04-24 09:09:37 +08:00 |
|
|
hufangzhou
|
ff2824a005
|
Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-24 08:13:57 +08:00 |
|
|
王怡栋
|
4cf9bdb506
|
Merge branch 'cyy_fixbug' into '18.4'
Cyy fixbug
See merge request easycorp/zentaopms!7558
|
2023-04-23 10:03:38 +00:00 |
|
|
ci
|
53b9008033
|
Merge branch 'master' into 18.4
|
2023-04-23 18:02:52 +08:00 |
|
|
ci
|
59573900a6
|
* Revert the code.
|
2023-04-23 17:30:56 +08:00 |
|
|
朱金勇
|
2ed6472bc8
|
Merge branch 'fix_safe_notice' into 'master'
* Fix notice switch error in admin safe page.
See merge request easycorp/zentaopms!7557
|
2023-04-23 08:00:43 +00:00 |
|
|
Lufei
|
99f7f62456
|
* Fix notice switch error in admin safe page.
|
2023-04-23 15:51:35 +08:00 |
|
|
wangyidong
|
f185508411
|
Merge branch 'cyy_fixbug' of https://git.zcorp.cc/easycorp/zentaopms into 18.4
|
2023-04-23 13:25:38 +08:00 |
|
|
tianshujie
|
690b95977e
|
* Fix SQL error.
|
2023-04-23 13:06:00 +08:00 |
|
|
刘刚
|
8792d9217e
|
Merge branch 'daitingting_bug_#34576' into 'master'
* Fix bug #34576.
See merge request easycorp/zentaopms!7555
|
2023-04-23 03:27:29 +00:00 |
|
|
daitingting
|
ddf2339b06
|
* Fix bug #34576.
|
2023-04-23 11:26:27 +08:00 |
|
|
王怡栋
|
793eab88b4
|
Merge branch 'hufangzhou_bug_31818' into '18.4'
* Fix bug #31818.
See merge request easycorp/zentaopms!7554
|
2023-04-23 03:04:47 +00:00 |
|
|
tianshujie
|
965b868fdb
|
* Fix bug #34604.
|
2023-04-23 10:58:58 +08:00 |
|
|
tianshujie
|
f18cde5955
|
* Fix bug #34601.
|
2023-04-23 10:58:23 +08:00 |
|
|
刘刚
|
3354e5edf9
|
Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix bug #34582.
See merge request easycorp/zentaopms!7553
|
2023-04-21 08:53:46 +00:00 |
|
|
刘刚
|
323ad9c04b
|
Merge branch 'dev/gfl_fixbug' into 'master'
* Code for bug #34552 .
See merge request easycorp/zentaopms!7552
|
2023-04-21 08:52:03 +00:00 |
|
|
hufangzhou
|
92175b0f48
|
* Fix bug #31818.
|
2023-04-21 16:51:39 +08:00 |
|
|
wangyuting2
|
78daa4faef
|
* Fix bug #34582.
|
2023-04-21 16:49:52 +08:00 |
|
|
liugang
|
9434e3f438
|
* Merge the functions extended in biz.
|
2023-04-21 08:45:00 +00:00 |
|
|
liugang
|
08f856a1ab
|
* Move the function from biz extension.
|
2023-04-21 08:44:39 +00:00 |
|
|
刘刚
|
0f0342b10a
|
Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7549
|
2023-04-21 08:43:11 +00:00 |
|
|
guofeilong
|
92157e7236
|
* Code for bug #34552 .
|
2023-04-21 16:41:44 +08:00 |
|
|
caoyanyi
|
352eb6f504
|
* Modify date default value.
|
2023-04-21 16:34:10 +08:00 |
|
|
王怡栋
|
c728da786e
|
Merge branch 'cyy_fixbug' into 'master'
* Change date NOT NULL to date NULL.
See merge request easycorp/zentaopms!7551
|
2023-04-21 08:33:26 +00:00 |
|