beauty-erp.git - Gitblit

Helius

2021-11-30 d4c997972509c2da06b1128086b1735597823d3f

refs	ty_fix
author	Helius <wangdoubleone@gmail.com>
	Tuesday, November 30, 2021 17:19 +0800
committer	Helius <wangdoubleone@gmail.com>
	Tuesday, November 30, 2021 17:19 +0800
commit	d4c997972509c2da06b1128086b1735597823d3f
tree	109371263c0a9f6f5f9bb28c79b301dff07b45bf tree \| zip \| gz
parent	889a06de8803791cb3ee59823c6259d3909336d9 view \| diff 562b530c6bf6d3be392240b217884629a3b97fbe view \| diff

Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix

7 files modified

	zq-erp/pom.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/application.properties	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/mdprd/system.properties	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/prd/system.properties	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/test/system.properties	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html	148 ●●●●● diff \| view \| raw \| blame \| history