 梁琦涛
|
f21a4de790
|
Merge branch 'master' into branch20211008
|
2021-11-01 11:18:50 +08:00 |
|
|
梁琦涛
|
758d3f7cca
|
定时任务修改
|
2021-11-02 00:09:19 +08:00 |
|
|
lijiarao
|
4a46f49eed
|
update 日志输出位置
|
2021-11-01 11:15:35 +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
|
7de8c7ff0d
|
增加短信日志
|
2021-11-01 10:58:22 +08:00 |
|
|
梁琦涛
|
c793f80e61
|
Merge branch 'branch20211008'
|
2021-11-01 09:52:16 +08:00 |
|
|
梁琦涛
|
eb19a05584
|
Merge remote-tracking branch 'origin/branch20211008' into branch20211008
|
2021-11-01 09:49:02 +08:00 |
|
|
梁琦涛
|
9d94409003
|
添加小程序接口
|
2021-11-01 09:48:44 +08:00 |
|
|
zhangqinlin
|
0e4bc950ba
|
fixbug:41716
|
2021-11-01 09:48:25 +08:00 |
|
|
梁琦涛
|
07c0df9e34
|
Merge remote-tracking branch 'origin/master'
|
2021-11-01 09:26:16 +08:00 |
|
|
梁琦涛
|
1e0f5c0be7
|
Merge branch 'branch20211008'
|
2021-11-01 09:25:44 +08:00 |
|
|
梁琦涛
|
6b2934d4bb
|
修改bug#41757
|
2021-11-01 09:25:03 +08:00 |
|
|
zhangqinlin
|
834ad746d8
|
fixbug:41716
|
2021-11-01 09:14:36 +08:00 |
|
|
lijiarao
|
da102eb958
|
Merge branch 'branch20211008'
|
2021-11-01 09:13:50 +08:00 |
|
|
梁琦涛
|
29fc1ef51d
|
修改bug#41722
|
2021-11-01 09:02:26 +08:00 |
|
|
lijiarao
|
5372f5b8c4
|
fix bug 41748 我的消息--工作组/分标委成员单位汇款或线上缴费收不到消息
fix bug 41754 对接人修改参会人信息时，没做修改直接确定，报提示
|
2021-10-29 19:03:04 +08:00 |
|
|
lijiarao
|
b2ed99b4f9
|
fix bug 除了会议负责人之外的角色也可以新增参会人
|
2021-10-29 17:11:03 +08:00 |
|
|
lijiarao
|
5ca0e0b5c8
|
fix bug 41739 会议维护--导出--数据为空时，点击导出后提示“没有数据”
|
2021-10-29 16:38:47 +08:00 |
|
|
lijiarao
|
e29fc1a80f
|
fix bug 41662 标协会员-在来款系统中修改邮寄信息，在会员系统中没有同步
|
2021-10-29 15:55:56 +08:00 |
|
|
lijiarao
|
33f65f4162
|
fix bug 41705,41704 资料网元项目水平越权
|
2021-10-29 14:46:06 +08:00 |
|
|
lijiarao
|
e3ac24b7d0
|
fix 报名信息审核通过之后才能审核付款凭证
|
2021-10-29 13:54:25 +08:00 |
|
|
lijiarao
|
2eb5d83e0d
|
fix bug 41649 小程序手机号密码登录时报错
|
2021-10-29 11:53:26 +08:00 |
|
|
lijiarao
|
5ed77e5d18
|
fix 组织机构导入提示语
|
2021-10-29 10:33:33 +08:00 |
|
|
梁琦涛
|
3ce7e52009
|
首页变更修改本月新增收款项
|
2021-10-29 10:23:27 +08:00 |
|
|
lijiarao
|
a77b5cd0e8
|
fix bug 41161 【ie】图片显示不出来
|
2021-10-29 10:01:14 +08:00 |
|
|
梁琦涛
|
153449783b
|
Merge branch 'master' into xuqiubiangeng1026
|
2021-10-29 09:59:57 +08:00 |
|
|
梁琦涛
|
33b962037f
|
修改bug#40897
|
2021-10-29 09:48:20 +08:00 |
|
|
lijiarao
|
5fa728bb7e
|
Merge branch 'branch20211008'
|
2021-10-29 09:44:46 +08:00 |
|
|
lijiarao
|
ebc9a8e4db
|
fix 报名截止时间精确到时分
|
2021-10-29 09:44:33 +08:00 |
|
|
梁琦涛
|
7debfa7436
|
Merge remote-tracking branch 'origin/master'
|
2021-10-29 09:13:30 +08:00 |
|
|
梁琦涛
|
b184284505
|
Merge branch 'branch20211008'
|
2021-10-29 09:12:22 +08:00 |
|
|
lijiarao
|
50bbc22ef4
|
Merge branch 'branch20211008'
|
2021-10-29 09:10:03 +08:00 |
|
|
lijiarao
|
e0c97b1bee
|
fix 报名截止时间精确到时分秒
|
2021-10-29 09:09:36 +08:00 |
|
|
lijiarao
|
5310c6dbe7
|
add 新增需要token的下载接口
|
2021-10-28 20:25:23 +08:00 |
|
|
梁琦涛
|
6ebf03cc09
|
消息变更
|
2021-10-28 18:28:55 +08:00 |
|
|
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 |
|