 chen
|
397c39ec69
|
合并ing
|
4 years ago |
|
chen
|
1eedb4e26b
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
chen
|
f7c013d3d7
|
提交
|
4 years ago |
shijie
|
a6a938e6cd
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-crms/pom.xml
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java
|
4 years ago |
|
chen
|
0f42d6b9a4
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
chen
|
8664c0d350
|
合并
|
4 years ago |
|
shijie
|
8588ff7ab1
|
bug修复，pom文件处理还原
|
4 years ago |
|
chen
|
bb9f2daef6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/PersonalEfficiencyListRequest.java
|
4 years ago |
|
chen
|
d0744f7ef3
|
提交代码
|
4 years ago |
river
|
935b8b1883
|
流程效率、业务统计、客户、人力导入导出
|
4 years ago |
|
river
|
824f7d1653
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-framework-utils/src/main/java/com/daqing/framework/utils/excel/TaskNodeConverter.java
|
4 years ago |
|
chen
|
e32c4e2f5b
|
提交
|
4 years ago |
|
river
|
e57df6c00f
|
Merge branch 'master' of D:\git_repository\msc-Demo\dqFinancial with conflicts.
|
4 years ago |
|
chen
|
2c138d7031
|
提交
|
4 years ago |
|
chen
|
b5dba4b13f
|
个人效率
|
4 years ago |
|
chen
|
815c5492c7
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
chen
|
378c0bf641
|
提交bug
|
4 years ago |
|
shijie
|
c303fef94d
|
业务编号格式
|
4 years ago |
|
shijie
|
d909f94e58
|
首页统计
|
4 years ago |
|
shijie
|
814ba6b464
|
首页统计
|
4 years ago |
|
shijie
|
7a79510208
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
|
4 years ago |
|
river
|
8fc0ceaf4a
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
river
|
81a2cdf6cb
|
团队效率
|
4 years ago |
|
shijie
|
4fbb161be4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
|
4 years ago |
|
chen
|
30fb6e93e8
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgEfficiencyController.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgEfficiencyService.java
# dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgEfficiencyServiceImpl.java
|
4 years ago |
|
chen
|
451607772b
|
业务流程工具修改
|
4 years ago |
|
shijie
|
7baed70455
|
首页统计
|
4 years ago |
|
river
|
9b3891d48d
|
团队效率
|
4 years ago |
|
shijie
|
3d35a02d86
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java
|
4 years ago |
|
shijie
|
38a6712927
|
角色权限模块处理
|
4 years ago |
|
river
|
9a06ca337f
|
修复业务流程状态
|
4 years ago |
|
chen
|
34081b29df
|
提交bug
|
4 years ago |
|
shijie
|
7c93103a9c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/PermissionServiceImpl.java
|
4 years ago |
|
shijie
|
71b16579c0
|
空格
|
4 years ago |
|
chen
|
ccfe65392a
|
更改maven聚合
|
4 years ago |
|
shijie
|
f9a6ea993d
|
角色权限模块处理
|
4 years ago |
|
shijie
|
d18b905343
|
角色权限模块处理
|
4 years ago |
|
shijie
|
37191fda92
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
shijie
|
749c43bd1d
|
角色权限模块处理
|
4 years ago |
|
chen
|
250cd455fc
|
测试服务器配置
|
4 years ago |
|
shijie
|
c14be59329
|
bug修复
|
4 years ago |
|
shijie
|
e90656db47
|
列表加排序
|
4 years ago |
|
shijie
|
9c658eaf93
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
shijie
|
4a0955035c
|
跨级加逐级驳回调整
|
4 years ago |
|
chen
|
fa6c6b1035
|
提交。。
|
4 years ago |
|
chen
|
cb30656a03
|
提交代码
|
4 years ago |
|
chen
|
c93f03204d
|
提交。。
|
4 years ago |
|
chen
|
dbaf945ff0
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
chen
|
459d06aa3f
|
完善功能
|
4 years ago |
|
river
|
6db55cdc7a
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
