Commit Graph
1732 Commits
Author SHA1 Message Date
梁琦涛 974133c5a4 工作组变更 2022-04-21 14:10:34 +08:00
梁琦涛 ea1610a4cb Merge remote-tracking branch 'origin/work_group_update' into work_group_update 2022-04-21 13:41:29 +08:00
梁琦涛 7a1c259f20 工作组变更 2022-04-21 13:41:21 +08:00
baozhipeng e8d4fb545a 是否内部企业 2022-04-21 12:05:40 +08:00
baozhipeng 4a48c51c57 是否内部企业 2022-04-20 17:22:30 +08:00
fengchenchen 445784f520 [bug] -IDM单点登录 参数修改 2022-04-20 17:00:07 +08:00
梁琦涛 dd895ca1b5 工作组变更 2022-04-20 14:54:17 +08:00
梁琦涛 c3dc3cb2d2 工作组变更 2022-04-19 13:57:59 +08:00
梁琦涛 ff515da6e8 工作组变更 2022-04-19 13:40:36 +08:00
lijiarao 68c0e1b6bb add 小程序默认会议列表全部时,展示未结束的会议 2022-04-19 09:39:37 +08:00
梁琦涛 32f319e768 工作组变更 2022-04-19 09:15:18 +08:00
lijiarao 54b1c4b089 add 小程序默认会议列表全部时,展示未结束的会议 2022-04-18 18:05:39 +08:00
lijiarao 4dfbf82c2a Merge remote-tracking branch 'origin/branch2022-1-4' 2022-04-12 17:35:30 +08:00
lijiarao 5cfd0643da add 增加验证token接口,token过期时间延长为24小时 2022-04-12 17:19:52 +08:00
lijiarao 75c7e4d5f6 fix 代码没有import 2022-04-12 17:01:38 +08:00
zhangqinlin cf7c65d0a3 合同sql 2022-04-12 16:28:18 +08:00
lijiarao 1208be79d4 Merge remote-tracking branch 'origin/2022-4-7'
# Conflicts:
#	jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PayIncomeContractServiceImpl.java
2022-04-12 15:45:24 +08:00
baozhipeng fa13cfa32a 单点登录 2022-04-11 15:56:26 +08:00
baozhipeng b6af2a6bcb Merge branch 'SingleSignOn' into branch2022-1-4
# Conflicts:
#	db/2022-1-4变更.sql
2022-04-11 15:42:20 +08:00
baozhipeng da385bd445 导入工号 2022-04-11 15:36:43 +08:00
zhangqinlin a94c3bb149 fix:bug 2022-04-11 14:41:25 +08:00
zhangqinlin 0486373d50 同步合同邮寄数据 2022-04-11 14:31:37 +08:00
zhangqinlin 7553bd6673 变更 2022-04-11 13:37:47 +08:00
baozhipeng f6e04a5d1f 导入工号 2022-04-08 18:00:33 +08:00
baozhipeng 5fb04e6b0b 导入工号 2022-04-08 17:59:40 +08:00
baozhipeng eb330fcf17 导入工号 2022-04-08 17:51:14 +08:00
baozhipeng 6ea8df1f08 导入工号 2022-04-08 17:49:34 +08:00
baozhipeng 9d94e412c2 Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4
# Conflicts:
#	db/2022-1-4变更.sql
2022-04-08 17:46:55 +08:00
baozhipeng 22e540cbf0 导入工号 2022-04-08 17:46:37 +08:00
baozhipeng 5d2578ebfa 导入工号 2022-04-08 17:46:04 +08:00
lijiarao b967391e3c fix 工作组项目增加是否打包查询 2022-04-08 14:42:43 +08:00
zhangqinlin 282af8c456 fix:bug 2022-04-08 11:50:00 +08:00
zhangqinlin a2ed3fcfe5 fix:bug 2022-04-08 10:34:03 +08:00
zhangqinlin 8b96235c29 fix:合同sql 2022-04-08 09:58:56 +08:00
zhangqinlin d66e618b03 fix:bug 2022-04-08 09:51:48 +08:00
zhangqinlin d34c0012fa add:变更 2022-04-07 18:20:59 +08:00
liangqitao e9710d989a 支出合同导入功能修改 2022-04-07 17:24:25 +08:00
liangqitao 5cb764a569 支出合同状态修改 2022-04-07 16:47:36 +08:00
baozhipeng eb8a176d3e 单点登录 2022-04-07 16:19:51 +08:00
liangqitao 4b8a253623 收入合同联系人姓名显示错误修改 2022-04-07 15:48:52 +08:00
liangqitao 4c3e1d6ef0 收入合同联系人姓名显示错误修改 2022-04-07 15:48:12 +08:00
liangqitao e002a174d8 收入合同联系人姓名显示错误修改 2022-04-07 15:43:00 +08:00
liangqitao 0bf00fd589 收入合同联系人姓名显示错误修改 2022-04-07 15:30:50 +08:00
baozhipeng 4e42794bbe 单点登录 2022-04-07 13:51:07 +08:00
baozhipeng 88782644ff 单点登录 2022-04-07 13:49:52 +08:00
baozhipeng 5c66d75392 单点登录 2022-04-07 12:24:14 +08:00
lijiarao d71a5324ea fix 企业变更管理员后之前的管理员的身份没有更新 2022-04-07 11:00:49 +08:00
lijiarao 6e022d30ea update 日志文件 2022-04-07 11:00:45 +08:00
lijiarao 05b36ba46a update 日志文件 2022-04-07 11:00:42 +08:00
zhangqinlin f0a7ffca81 add:变更 2022-04-06 21:46:47 +08:00