parent: 1354e6 | patch | commitdiff
Helius
2020-12-23 844e37605b65a2a3d95b466d663d91ac8584350c
refs
author Helius <wangdoubleone@gmail.com>
Wednesday, December 23, 2020 21:28 +0800
committer Helius <wangdoubleone@gmail.com>
Wednesday, December 23, 2020 21:28 +0800
commit844e37605b65a2a3d95b466d663d91ac8584350c
tree ba752c846de82495b0aed48a90e21d1d1eea6711 tree | zip | gz
parent 1354e67e7ee60370c6ff293a45f4b5e9c8a2a59b view | diff
e3b4931158274097a8389b4fbec05e44ac0bb2d2 view | diff 
Merge branch 'ty_urgent' into api
10 files modified
2 files added
1771 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 384 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html 479 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/custom-consume-list.html 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html 140 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 244 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html 159 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html 296 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html 22 ●●●●● diff | view | raw | blame | history