 lijiarao
|
ca00bf1995
|
fix bug 41534 收入合同-关联项目-选择会议-点击新增-点击选择会议页面---这块选择的会议没有数据,
|
2021-10-28 18:20:47 +08:00 |
|
|
lijiarao
|
6d4463b2a5
|
fix bug 41652 门户端-会议详情页面-负责人应该显示姓名，但显示成了用户名
|
2021-10-28 17:46:59 +08:00 |
|
|
梁琦涛
|
84789d348c
|
1.打包管理-添加打包项目-选择项目弹框
2.票据邮寄列表
3.到账开票列表
添加企业联系人
|
2021-10-28 16:50:35 +08:00 |
|
|
lijiarao
|
bfe515d73d
|
fix bug 会议和会员项目的水平越权
|
2021-10-28 16:43:12 +08:00 |
|
|
梁琦涛
|
9071dd6180
|
Merge branch 'master' into xuqiubiangeng1026
|
2021-10-28 16:35:25 +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 |
|
|
梁琦涛
|
ab2a0f51be
|
修改越权问题
|
2021-10-28 15:24:53 +08:00 |
|
|
梁琦涛
|
5abf03d353
|
修改bug#40676
|
2021-10-28 15:10:12 +08:00 |
|
|
梁琦涛
|
df9164d321
|
Merge remote-tracking branch 'origin/branch20211008' into branch20211008
|
2021-10-28 14:29:20 +08:00 |
|
|
梁琦涛
|
8f442d309b
|
修改bug#40985
|
2021-10-28 14:29:12 +08:00 |
|
|
lijiarao
|
51b89b9227
|
fix bug 41581 报名链接--新增的用户首次登录--没有强制设置密码，直接进入系统
|
2021-10-28 14:00:40 +08:00 |
|
|
梁琦涛
|
0aa1abd5af
|
修改bug#41520
|
2021-10-28 13:50:29 +08:00 |
|
|
梁琦涛
|
1c79b30be5
|
Merge remote-tracking branch 'origin/branch20211008' into branch20211008
|
2021-10-28 11:44:41 +08:00 |
|
|
梁琦涛
|
8e3f0f8de5
|
修改bug#41540
|
2021-10-28 11:44:28 +08:00 |
|
|
lijiarao
|
9fc7045441
|
Merge remote-tracking branch 'origin/branch20211008'
# Conflicts:
# jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
# jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
|
2021-10-28 11:14:55 +08:00 |
|
|
lijiarao
|
12a0f68e70
|
fix bug 组织机构导入提示语
|
2021-10-28 11:08:39 +08:00 |
|
|
梁琦涛
|
e9aca4d4d7
|
修改bug#41582
|
2021-10-28 11:08:09 +08:00 |
|
|
梁琦涛
|
90a2585224
|
修改bug#41582
|
2021-10-28 10:55:13 +08:00 |
|
|
梁琦涛
|
8f5bc2f104
|
修改bug#41566
|
2021-10-28 10:17:19 +08:00 |
|
|
梁琦涛
|
cecdd93e8a
|
Merge remote-tracking branch 'origin/branch20211008' into branch20211008
|
2021-10-28 10:14:36 +08:00 |
|
|
梁琦涛
|
74db8ab27b
|
修改bug#41590
|
2021-10-28 10:14:28 +08:00 |
|
|
lijiarao
|
59ff173699
|
fix bug 组织机构导入提示语
|
2021-10-28 10:07:10 +08:00 |
|
|
zhangqinlin
|
1b8c7546e5
|
fixbug：企业端下载和财务人员统计信息
|
2021-10-28 09:59:42 +08:00 |
|
|
lijiarao
|
b8b1d30dae
|
fix 分标委会议参会人水平权限
|
2021-10-27 18:49:25 +08:00 |
|
|
梁琦涛
|
e239b4d3cc
|
修改bug#41556
|
2021-10-27 18:32:50 +08:00 |
|
|
梁琦涛
|
3a245288f9
|
修改bug#41556
|
2021-10-27 18:32:19 +08:00 |
|
|
梁琦涛
|
b489ebb49d
|
添加小程序接口
|
2021-10-27 18:22:52 +08:00 |
|
|
梁琦涛
|
320e348ba3
|
Merge remote-tracking branch 'origin/branch20211008' into branch20211008
|
2021-10-27 18:13:25 +08:00 |
|
|
梁琦涛
|
0f6ac2b1db
|
合同关联项目变更
|
2021-10-27 17:51:59 +08:00 |
|
|
lijiarao
|
1c1f3d0aca
|
fix 逻辑删除判断条件
|
2021-10-27 17:41:27 +08:00 |
|
|
zhangqinlin
|
7ad01a4345
|
fixbug：企业端联系人查询
|
2021-10-27 17:13:54 +08:00 |
|
|
zhangqinlin
|
8afac860a8
|
fixbug：企业端联系人查询
|
2021-10-27 17:04:37 +08:00 |
|
|
zhangqinlin
|
a89926f5fd
|
注释不需要内容
|
2021-10-27 16:42:14 +08:00 |
|
|
lijiarao
|
0bbb6cd2c2
|
fix bug 修改组织机构导入提示语
|
2021-10-27 16:42:14 +08:00 |
|
|
lijiarao
|
08de09502b
|
fix bug 40291 修改组织机构导入提示语
|
2021-10-27 16:42:13 +08:00 |
|
|
zhangqinlin
|
9fc493d180
|
fixbug:41485,41439
|
2021-10-27 16:42:13 +08:00 |
|
|
zhangqinlin
|
e9eb5dba8e
|
注释不需要内容
|
2021-10-27 16:26:30 +08:00 |
|
|
lijiarao
|
2d1d3623a8
|
fix bug 修改组织机构导入提示语
|
2021-10-27 16:14:57 +08:00 |
|
|
梁琦涛
|
1362303222
|
普通项目，工作组项目选择合同编号变更
|
2021-10-27 15:41:38 +08:00 |
|
|
lijiarao
|
8764d9ef97
|
fix bug 40291 修改组织机构导入提示语
|
2021-10-27 11:59:43 +08:00 |
|
|
梁琦涛
|
318041a226
|
消息变更
|
2021-10-27 11:55:40 +08:00 |
|
|
梁琦涛
|
23439eb475
|
项目选择合同编号变更
|
2021-10-27 11:39:43 +08:00 |
|
|
lijiarao
|
32e3ffc4e6
|
Merge branch 'branch20211008'
|
2021-10-27 09:16:41 +08:00 |
|
|
zhangqinlin
|
6b6c910ecf
|
fixbug:41485,41439
|
2021-10-27 09:14:36 +08:00 |
|
|
lijiarao
|
002d61c5f0
|
fix 升级tomcat为最新版本9.0.54
|
2021-10-27 09:12:04 +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 |
|
|
梁琦涛
|
199307bbf7
|
Merge branch 'branch20211008'
|
2021-10-26 19:16:12 +08:00 |
|
|
梁琦涛
|
f857095b4f
|
收入合同权限修改
|
2021-10-26 19:15:21 +08:00 |
|