autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-25 21:45:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBillingTemplateService.java
This commit is contained in:
autumn.g@foxmail.com
2023-06-25 17:21:42 +08:00
parent 9720046a88 b2eb62a48a
commit 322738e266
7 changed files with 75 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml
View File

@@ -291,6 +291,7 @@
t2.id as templateId,
t2.template_code as templateCode,
t2.name as templateName,
t2.status,
t2.remark as remark,
t2.type as deviceType,
t2.publish_time as publishTime,