梁琦涛
|
3be9f7b2cd
|
修改bug#41796
|
2021-11-01 14:05:06 +08:00 |
|
梁琦涛
|
82253c88bf
|
修改bug#41775
|
2021-11-01 11:24:49 +08:00 |
|
梁琦涛
|
ec253597ab
|
Merge branch 'xuqiubiangeng1026'
# Conflicts:
# jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
|
2021-11-01 11:15:08 +08:00 |
|
梁琦涛
|
29fc1ef51d
|
修改bug#41722
|
2021-11-01 09:02:26 +08:00 |
|
梁琦涛
|
a784851bbc
|
支出合同变更修改
|
2021-10-28 16:34:47 +08:00 |
|
梁琦涛
|
e7117db802
|
Merge branch 'branch20211008' into xuqiubiangeng1026
# Conflicts:
# jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
# jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java
# jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
|
2021-10-28 16:15:29 +08:00 |
|
梁琦涛
|
4ad3f471ec
|
合同编号修改成下拉框,做校验
|
2021-10-28 16:08:35 +08:00 |
|
梁琦涛
|
0aa1abd5af
|
修改bug#41520
|
2021-10-28 13:50:29 +08:00 |
|
梁琦涛
|
e239b4d3cc
|
修改bug#41556
|
2021-10-27 18:32:50 +08:00 |
|
梁琦涛
|
3a245288f9
|
修改bug#41556
|
2021-10-27 18:32:19 +08:00 |
|
梁琦涛
|
0f6ac2b1db
|
合同关联项目变更
|
2021-10-27 17:51:59 +08:00 |
|
梁琦涛
|
23439eb475
|
项目选择合同编号变更
|
2021-10-27 11:39:43 +08:00 |
|
梁琦涛
|
6e0b0a56d9
|
Merge branch 'master' into xuqiubiangeng1026
# Conflicts:
# jero-boot-incoming-payment/src/main/java/com/jero/contract/entity/PaySpendingContract.java
|
2021-10-26 19:20:55 +08:00 |
|
梁琦涛
|
f857095b4f
|
收入合同权限修改
|
2021-10-26 19:15:21 +08:00 |
|
梁琦涛
|
7065ec5edd
|
收入合同已收金额变更
|
2021-10-26 18:58:19 +08:00 |
|
梁琦涛
|
f1a5b3ac37
|
支出合同修改
|
2021-10-26 17:00:32 +08:00 |
|
梁琦涛
|
244d75f283
|
支出合同变更修改
|
2021-10-26 16:14:19 +08:00 |
|
梁琦涛
|
bd8c038873
|
需求变更,打包管理列表添加联系人电话、邮箱
|
2021-10-25 17:30:18 +08:00 |
|
梁琦涛
|
c36aac4a9b
|
需求变更,收入合同添加打包状态,打包年份
|
2021-10-25 16:45:08 +08:00 |
|
梁琦涛
|
abbafe1109
|
修改bug#41370
|
2021-10-25 16:18:27 +08:00 |
|
梁琦涛
|
0299d811d0
|
工作组复制功能变更
|
2021-10-25 10:15:00 +08:00 |
|
梁琦涛
|
eebd3b6ddd
|
修改提示语
|
2021-10-22 12:02:24 +08:00 |
|
梁琦涛
|
53dc2227df
|
修改#41154
|
2021-10-21 17:09:24 +08:00 |
|
梁琦涛
|
2e01926480
|
修改#40990
|
2021-10-21 16:18:51 +08:00 |
|
梁琦涛
|
b3de149942
|
修改bug#40997
|
2021-10-21 14:34:30 +08:00 |
|
梁琦涛
|
351901d5ca
|
修改bug#41000
|
2021-10-21 14:19:41 +08:00 |
|
梁琦涛
|
1dd84eddac
|
修改bug#41007
|
2021-10-21 10:36:55 +08:00 |
|
梁琦涛
|
b50ce26000
|
修改bug#40984
|
2021-10-21 10:15:01 +08:00 |
|
梁琦涛
|
d7f4f95104
|
修改bug#40965
|
2021-10-21 09:28:46 +08:00 |
|
梁琦涛
|
defe688ad5
|
修改bug#40965
|
2021-10-20 19:43:42 +08:00 |
|
梁琦涛
|
0ee9fe0946
|
修改bug#40960
|
2021-10-20 19:37:00 +08:00 |
|
梁琦涛
|
7257e6d5c8
|
修改bug#40955
|
2021-10-20 19:29:27 +08:00 |
|
梁琦涛
|
0a7770bdf0
|
修改bug#41057
|
2021-10-20 15:26:04 +08:00 |
|
梁琦涛
|
ba77bc1810
|
修改bug#40897
|
2021-10-20 10:03:40 +08:00 |
|
梁琦涛
|
849ca76ad1
|
添加合同权限限制
|
2021-10-20 09:25:25 +08:00 |
|
梁琦涛
|
302982757e
|
修改bug#41013
|
2021-10-19 18:26:08 +08:00 |
|
梁琦涛
|
63ac63bad3
|
修改bug#41017
|
2021-10-19 18:11:10 +08:00 |
|
梁琦涛
|
3603ae872b
|
修改bug#40941
|
2021-10-19 18:00:43 +08:00 |
|
梁琦涛
|
1d5c93876b
|
修改bug#40940
|
2021-10-19 17:49:06 +08:00 |
|
梁琦涛
|
1a53f10c64
|
修改bug#40939
|
2021-10-19 16:41:54 +08:00 |
|
梁琦涛
|
cb81762f39
|
修改bug#40944
|
2021-10-19 16:14:02 +08:00 |
|
梁琦涛
|
430409b296
|
修改bug#40905
|
2021-10-19 10:29:59 +08:00 |
|
梁琦涛
|
1b1703b01c
|
修改bug#40877
|
2021-10-18 16:14:45 +08:00 |
|
梁琦涛
|
473bb95904
|
修改bug#40882
|
2021-10-18 15:11:24 +08:00 |
|
梁琦涛
|
469cee4c9a
|
添加验证项目是否关联合同接口
|
2021-10-18 15:07:29 +08:00 |
|
梁琦涛
|
cdb86ca8bc
|
修改bug#40871
|
2021-10-18 13:36:31 +08:00 |
|
梁琦涛
|
e5795a5a19
|
修改bug#40674
|
2021-10-14 16:57:16 +08:00 |
|
梁琦涛
|
f82fbabc88
|
修改bug#40619
|
2021-10-14 13:37:03 +08:00 |
|
梁琦涛
|
56724b91b4
|
修改bug#40461
|
2021-10-12 15:36:10 +08:00 |
|
梁琦涛
|
2a85d551f7
|
模糊查询替换%
|
2021-10-11 16:36:03 +08:00 |
|