beauty-erp.git - Gitblit

Helius

2021-04-19 815b7f21921c620e7605c461a3c4b4bbc4a26494

refs
author	Helius <wangdoubleone@gmail.com>
	Monday, April 19, 2021 14:42 +0800
committer	Helius <wangdoubleone@gmail.com>
	Monday, April 19, 2021 14:42 +0800
commit	815b7f21921c620e7605c461a3c4b4bbc4a26494
tree	f517fef72f0f4b69801961e95a18fe779fc8cf51 tree \| zip \| gz
parent	89bcd2fc777c20701f6e68accd71375b41327b87 view \| diff 7582aeae8ed09d6d938d6d24e9c59eeb90799d76 view \| diff

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

4 files modified

6 files added

	zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java	18 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/images/sign/jisumiaosha.png	diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/images/sign/meiriqiandao.png	diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/images/sign/shalonghuodong.png	diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/images/sign/signButton.png	diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/images/sign/signHead.png	diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/images/sign/tiantianpingtuan.png	diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html	16 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html	84 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html	40 ●●●●● diff \| view \| raw \| blame \| history