 lijiarao
|
d7db91a0a7
|
fix 来款编辑缴费发票信息
|
2022-08-18 15:33:33 +08:00 |
|
|
lijiarao
|
d39ffc5569
|
update 企业管理员查询资料网员
|
2022-08-16 10:57:09 +08:00 |
|
|
lijiarao
|
7c0c004735
|
add 企业信息增加联行号，标协缴费增加联行号
|
2022-08-12 12:15:09 +08:00 |
|
|
lijiarao
|
e19208f6b5
|
add 普通，工作组，资料网员编辑时修改邮寄信息中关联的联系人
|
2022-08-11 14:55:15 +08:00 |
|
|
lijiarao
|
305de4cb9b
|
Merge remote-tracking branch 'origin/master' into 22年七月工作
# Conflicts:
# jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbCertificatePayment.java
# jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
|
2022-08-08 09:48:50 +08:00 |
|
|
lijiarao
|
6ce83da943
|
udpate 实体类增加确认收入状态，税额，未税金额
|
2022-08-01 10:50:45 +08:00 |
|
|
lijiarao
|
14eb361600
|
add 会员系统组合缴费的三种金额
|
2022-07-18 09:58:36 +08:00 |
|
|
lijiarao
|
c7a8e7bdf8
|
Merge remote-tracking branch 'origin/branch20220421' into 22年七月工作
|
2022-07-04 10:28:28 +08:00 |
|
|
lijiarao
|
5fd6a177a3
|
fix 收入合同查询不到标协会员项目
|
2022-07-01 11:44:29 +08:00 |
|
|
lijiarao
|
a94626bb08
|
add 确认到账来款逻辑
|
2022-06-10 16:26:42 +08:00 |
|
|
fengchenchen
|
bc2dd3aca3
|
[bug] -修改证书缴费同步报错的bug
|
2022-05-09 18:21:13 +08:00 |
|
|
lijiarao
|
a6a8bcbe50
|
add 证书缴费审核时更新
|
2022-05-09 17:22:04 +08:00 |
|
|
lijiarao
|
bb9da2caef
|
update 会员缴费审核时更新
|
2022-05-09 15:55:45 +08:00 |
|
|
lijiarao
|
d46918d5df
|
add 会员缴费审核时更新
|
2022-05-09 15:27:17 +08:00 |
|
|
lijiarao
|
c027f41317
|
add 会员缴费增加发票信息
|
2022-05-09 14:16:11 +08:00 |
|
|
baozhipeng
|
2d56342e28
|
证书缴费撤回
|
2022-04-22 16:07:40 +08:00 |
|
|
lijiarao
|
c64f3cd9df
|
fix 47375 单位未审核时,多个模块未显示待审核标识,且有的模块标识名称不一致
|
2022-01-21 09:39:33 +08:00 |
|
|
lijiarao
|
015cab3b3a
|
fix 47375 单位未审核时,多个模块未显示待审核标识,且有的模块标识名称不一致
|
2022-01-17 17:23:55 +08:00 |
|
|
liangqitao
|
1bd7cec218
|
修改bug#46982
|
2022-01-07 10:33:09 +08:00 |
|
|
lijiarao
|
4875c14ef8
|
fix 会员会议编辑
|
2022-01-05 17:24:58 +08:00 |
|
|
lijiarao
|
3961338803
|
add 标协会员项目增加缴费时间
|
2021-12-20 15:40:41 +08:00 |
|
|
lijiarao
|
7422fb7515
|
update 同步证书来款邮寄信息
|
2021-12-20 14:42:15 +08:00 |
|
|
baozhipeng
|
68dbdb08de
|
标协会员项目详情\标协证书项目详情
|
2021-12-20 14:34:40 +08:00 |
|
|
zhangqinlin
|
da0851258e
|
fix:企业端分标委
|
2021-12-17 17:59:07 +08:00 |
|
|
zhangqinlin
|
ccbaa71fd3
|
fix:企业端分标委
|
2021-12-17 17:35:24 +08:00 |
|
|
zhangqinlin
|
cbbb96e204
|
add:资料网元手机号
|
2021-12-17 15:59:56 +08:00 |
|
|
lijiarao
|
8d40a41c73
|
add 会员证书
|
2021-12-16 20:28:20 +08:00 |
|
|
liangqitao
|
eb32827f03
|
消息修改
|
2021-12-16 17:20:48 +08:00 |
|
|
lijiarao
|
3f2af6729f
|
add 到账开票页面增加会员证书
|
2021-12-16 14:04:32 +08:00 |
|
|
liangqitao
|
5ada5fa147
|
消息修改
|
2021-12-16 11:48:25 +08:00 |
|
|
baozhipeng
|
72d7372b8b
|
缴费审核
|
2021-12-16 11:11:17 +08:00 |
|
|
lijiarao
|
8b38791486
|
add 缴费状态
|
2021-12-15 20:32:54 +08:00 |
|
|
baozhipeng
|
5759dd5e57
|
缴费状态
|
2021-12-15 18:09:35 +08:00 |
|
|
liangqitao
|
af401f3fea
|
合同管理-去掉审核流程，添加作废功能,添加消息功能
|
2021-12-15 16:01:12 +08:00 |
|
|
lijiarao
|
2883588c33
|
add 证书缴费表
|
2021-12-15 13:40:15 +08:00 |
|
|
lijiarao
|
f1f9610c3d
|
add 证书缴费表
|
2021-12-14 20:35:02 +08:00 |
|
|
lijiarao
|
7253dc2d9d
|
fix bug 42005 BXGLZ用户的角色配置确认
|
2021-11-03 15:12:00 +08:00 |
|
|
梁琦涛
|
957f4b43f3
|
修改bug#41972
|
2021-11-03 15:10:03 +08:00 |
|
|
lijiarao
|
1c09904647
|
fix bug 41826 对接人修改参会人信息时，负责人收到的信息
|
2021-11-02 14:52:19 +08:00 |
|
|
lijiarao
|
98ea94ddb9
|
fix bug 41839 标协会员项目-会议维护--会议负责人应该只能看自己的
|
2021-11-02 10:27:00 +08:00 |
|
|
梁琦涛
|
afe75bd075
|
消息变更
|
2021-11-01 18:33:09 +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 |
|
|
lijiarao
|
5ca0e0b5c8
|
fix bug 41739 会议维护--导出--数据为空时，点击导出后提示“没有数据”
|
2021-10-29 16:38:47 +08:00 |
|
|
lijiarao
|
33f65f4162
|
fix bug 41705,41704 资料网元项目水平越权
|
2021-10-29 14:46:06 +08:00 |
|
|
梁琦涛
|
153449783b
|
Merge branch 'master' into xuqiubiangeng1026
|
2021-10-29 09:59:57 +08:00 |
|
|
lijiarao
|
bfe515d73d
|
fix bug 会议和会员项目的水平越权
|
2021-10-28 16:43:12 +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 |
|
|
梁琦涛
|
0f6ac2b1db
|
合同关联项目变更
|
2021-10-27 17:51:59 +08:00 |
|
|
lijiarao
|
2d1d3623a8
|
fix bug 修改组织机构导入提示语
|
2021-10-27 16:14:57 +08:00 |
|