bobol
|
e6392f6b02
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
|
bobol
|
e6cd12b40e
|
大屏接口
|
9 months ago |
 ljlong_2630
|
74cbd25a8b
|
结局冲突，并修改dao修饰的bean加资产指标基础界面开发测试版
|
9 months ago |
zhousq
|
78e72866f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
|
zhousq
|
95737ea698
|
2023-12-15 修改代码生成器的bug
|
9 months ago |
|
bobol
|
95a1f639a2
|
日月底稿表互换表名
|
9 months ago |
|
zhousq
|
dc70d46e8a
|
2023-12-15 修改代码生成器的bug
|
9 months ago |
|
zhousq
|
bd66d76c50
|
2023-12-14 指标采集单录入，修改编码规则的序号生成不同步bug；修复发现的其他bug
|
9 months ago |
|
bobol
|
898c1c3a09
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
|
zhousq
|
168df14d84
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
|
zhousq
|
614678b08b
|
2023-12-13 参数采集单和采集模版，基础实体修改
|
9 months ago |
|
bobol
|
2446689dea
|
月指标报表
|
9 months ago |
|
ljlong_2630
|
ead1dde55f
|
优化asset的service
|
9 months ago |
|
bobol
|
c2118aa109
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
9 months ago |
|
bobol
|
9d3cb26ac4
|
月指标报表
|
9 months ago |
|
ljlong_2630
|
cd0515c3bc
|
解决冲突，资产表格机构树添加
|
9 months ago |
|
zhousq
|
1c569b84ec
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# lzbi-module/src/main/java/com/lzbi/module/base/BaseModuleEntity.java
# lzbi-module/src/main/java/com/lzbi/special/domain/DcBaseWorkSpecial.java
# lzbi-module/src/main/resources/mapper/targetFolder/DcBaseAssetTargetMapper.xml
|
9 months ago |
|
zhousq
|
fd63c6f23f
|
2023-12-12 采集但后台接口，调整相关连的对象，增加数据联动接口查询，map数据映射
|
9 months ago |
|
bobol
|
2a84565108
|
指标阅读计划
|
9 months ago |
|
bobol
|
aa4136e4ca
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 months ago |
|
bobol
|
2ead4399fa
|
调整单
|
9 months ago |
|
ljlong_2630
|
dae841def8
|
@Accessors(chain = true)注解添加
;
|
10 months ago |
|
ljlong_2630
|
814f68e47c
|
vxe-table界面改造部分功能 完成并提交
|
10 months ago |
|
ljlong_2630
|
cc252a955b
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
bobol
|
426ed364ac
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
bobol
|
7481cc673d
|
新增统计单元指标调整单子表(日)数据时，target_name字段从dc_base_asset_target表中获取
|
10 months ago |
|
zhousq
|
f1b693f6fd
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# lzbi-module/src/main/resources/mapper/asset/DcBaseAssetInfoMapper.xml
# lzbi-module/src/main/resources/mapper/asset/DcBaseWorkSpecialMapper.xml
|
10 months ago |
|
zhousq
|
0dca68058a
|
2023-12-7 新增接口，新增查询方法
|
10 months ago |
|
bobol
|
8cf6e4661d
|
修改接口权限
|
10 months ago |
|
ljlong_2630
|
87171a1e36
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
bobol
|
689afb6b0b
|
资产指标调整单处理接口
|
10 months ago |
|
bobol
|
fbbfc69e31
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
bobol
|
edb454077e
|
资产指标调整单处理接口
|
10 months ago |
|
zhousq
|
d9aa89f268
|
2023-12-6 新增编码规则、数据底稿表查询
|
10 months ago |
|
zhousq
|
a0e908047b
|
2023-12-6 代码生成bug修改，新增编码规则配置
|
10 months ago |
|
zhousq
|
fcc42f6a61
|
2023-12-6 代码生成器生成的文件名称修改
|
10 months ago |
|
zhousq
|
e42eb0098b
|
2023-12-6 代码生成器生成的文件名称修改
|
10 months ago |
|
bobol
|
840bf203b0
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
zhousq
|
35da74096b
|
2023-12-6 日志底稿类修改
|
10 months ago |
|
bobol
|
52299945c1
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
# Conflicts:
# lzbi-module/src/main/java/com/lzbi/draft/mapper/DcBusiTargetDraftDayMapper.java
|
10 months ago |
|
bobol
|
00e080e7d1
|
资产指标调整单审核接口
|
10 months ago |
|
zhousq
|
a5444e5eae
|
2023-12-6 代码生成器修改，修改日志表数据底稿
|
10 months ago |
|
ljlong_2630
|
efa8e3c727
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
zhousq
|
d1886d1b8e
|
2023-12-6 代码生成器修改，增加swagger注解
|
10 months ago |
|
ljlong_2630
|
ec4b8fe33d
|
‘解决冲突’
|
10 months ago |
|
bobol
|
180f9040de
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
|
zhousq
|
4588102252
|
2023-12-6 处理生产专业代码不同补问题
|
10 months ago |
|
zhousq
|
b5fe8cab39
|
2023-12-6 处理生产专业代码不同补问题
|
10 months ago |
|
zhousq
|
32569a3894
|
2023-12-6 处理生产专业代码不同补问题
|
10 months ago |
|
bobol
|
11264044c3
|
Merge branch 'develop' of https://gitee.com/lmlz_0/manage into develop
|
10 months ago |
