~jiangyouyao/beauty-erp.git

			@@ -274,7 +274,7 @@
			left join shop_product t3 on t2.goods_id=t3.id
			left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
			where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1 and t1.act_type=1
			and company_id=#{record.companyId}
			and t1.company_id=#{record.companyId}
			<if test="record !=null"><!-- 判断pageVo对象是否为空 -->
			<if test="record.sort !=null and record.order !=null">
			order by
			@@ -294,7 +294,7 @@
			left join shop_product t3 on t2.goods_id=t3.id
			left join shop_activities_group_price t4 on t1.id=t4.act_id and t4.seq=1
			where find_in_set(#{record.shopId}, t1.shop_ids) and t1.act_status=1
			and company_id=#{record.companyId}
			and t1.company_id=#{record.companyId}
			</select>

			<select id="selectGroupInfoByActId" resultMap="ShopActivitiesGroupInfoMap">

			@@ -1833,7 +1833,7 @@
			border: 1px solid #d7d8d9;
			color: #373d41;
			display: block;
			padding: 20px 12px;
			padding: 6px 12px;
			width: 100%;
			font-size: 14px -webkit-box-shadow: none !important;
			box-shadow: none !important;

			@@ -59,6 +59,19 @@

			<link th:href="@{/css/styleOne/login.min.css}" rel="stylesheet">
			<style type="text/css">
			.form-control {
			background-color: #FFF;
			background-image: none;
			border: 1px solid #d7d8d9;
			color: #373d41;
			display: block;
			padding: 20px 12px;
			width: 100%;
			font-size: 14px -webkit-box-shadow: none !important;
			box-shadow: none !important;
			border-radius: 0px !important;
			}

			.layui-layer-content {
			color: #000;
			}

	zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupInfoDao.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/css/styleOne/style.min.css	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/common/login.html	13 ●●●●● patch \| view \| raw \| blame \| history