nmy
|
a6ad9f8c7e
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# zlpt-modules/zlpt-bigScreen/src/main/java/com/bonus/zlpt/bigscreen/controller/MaDevInfoController.java
# zlpt-modules/zlpt-company/pom.xml
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BmCompanyInfoController.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/controller/BusinessOpenController.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BusinessOpen.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BusinessOpenMapper.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/BusinessOpenService.java
# zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BusinessOpenServiceImpl.java
# zlpt-modules/zlpt-company/src/main/resources/mapper/BusinessOpenMapper.xml
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/DevInfoMapper.java
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/mapper/UpOffMapper.java
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/ITypeInfoService.java
# zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/service/IUpOffService.java
# zlpt-modules/zlpt-equip/src/main/resources/mapper/FileInfoMapper.xml
# zlpt-modules/zlpt-equip/src/main/resources/mapper/UpOffMapper.xml
|
2023-12-04 17:15:05 +08:00 |
syruan
|
411f26aadf
|
POM配置提交
|
2023-12-02 15:34:20 +08:00 |
|
nmy
|
989f28bbc2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-12-02 15:19:50 +08:00 |
sxu
|
5e345300e0
|
add equip module
|
2023-12-02 15:18:58 +08:00 |
mashuai
|
850ffe3957
|
大屏模块
|
2023-12-02 14:53:57 +08:00 |
|
sxu
|
6a2259d048
|
add order module
|
2023-12-02 14:32:47 +08:00 |
 zfhai
|
ca19749012
|
修改文件名
|
2023-12-02 14:29:24 +08:00 |
|
nmy
|
8fdef4222c
|
连接池版本配置
|
2023-12-02 14:28:15 +08:00 |
|
zfhai
|
6a4ce0a7f6
|
修改文件名
|
2023-12-02 14:15:17 +08:00 |
|
zfhai
|
78ed074cbd
|
修改文件名
|
2023-12-02 13:09:47 +08:00 |