LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,410 Commits 2 Branches 0 Tags
ee9e353c3671f0201b115d4e0acebe95389332fd
Commit Graph
1410 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
梁琦涛 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
梁琦涛 7065ec5edd 收入合同已收金额变更 2021-10-26 18:58:19 +08:00
lijiarao 5f59d8426e fix bug 41393 41379 标协会议删除同步 2021-10-26 18:50:54 +08:00
lijiarao 02d81abb2f fix bug 41442 企业端--水平越权--会议活动--我的会议--可报名--上传凭证接口未处理 2021-10-26 18:02:29 +08:00
lijiarao e224d8a24c fix bug 41435 我的消息--分标委发布会议--收到的内容是工作组项目报名已开始 2021-10-26 17:43:59 +08:00
梁琦涛 6a3cbcc088 分标委会议添加发送消息 2021-10-26 17:11:18 +08:00
lijiarao ea0d4e0be7 fix bug 41403 到账开票--多次来款后,参会人列表显示了多条 2021-10-26 17:04:00 +08:00
梁琦涛 f1a5b3ac37 支出合同修改 2021-10-26 17:00:32 +08:00
lijiarao 81827eab08 fix bug 41475 资料网员项目--会员项目--导入--导入失败后的提示语有误 2021-10-26 16:55:41 +08:00
lijiarao 9bdcb64bb4 fix 合同添加参会人权限 2021-10-26 16:48:50 +08:00