beauty-erp.git - Gitblit

			@@ -2,16 +2,20 @@
			server.port=8080


			#spring.datasource.username=hive
			#spring.datasource.password=hive123!@#
			#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
			#线上测试环境

			#spring.datasource.username=ct_test
			#spring.datasource.password=123456
			#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8

			#spring.datasource.username=xc_shop
			#spring.datasource.password=xc_shop123!@#
			#spring.datasource.url=jdbc:mysql://124.70.222.34/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8


			spring.datasource.username=hive
			spring.datasource.password=hive123!@#
			spring.datasource.url=jdbc:mysql://124.70.222.34:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8



			spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8

			spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
			spring.datasource.initialSize=3

			@@ -29,8 +29,8 @@
			spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
			spring.thymeleaf.prefix: classpath:/templates/views/
			spring.thymeleaf.cache=false
			mybatis.config-location=classpath:mybatis/mybatis-config.xml
			mybatis.mapper-locations=classpath:mybatis/mapper//*.xml
			mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
			mybatis-plus.mapper-locations=classpath:mybatis/mapper//.xml
			#设置全局时间返回格式第三行设置为true表示返回时间戳
			#spring.jackson.date-format=yyyy-MM-dd
			#spring.jackson.time-zone=GMT+8

			@@ -118,7 +118,7 @@
			}
			</style>
			</head>
			<body style="overflow: hidden">
			<body >
			<div id="app" v-cloak>


			@@ -947,7 +947,7 @@

			// if (optionType != 1) {
			//直接修改支付金额不重置支付金额
			item.payMoney = (zkPrice * count).toFixed(2);
			item.payMoney = zkPrice * count;
			// }
			_this.order.payMoney += parseFloat(item.payMoney);

	zq-erp/src/main/resources/config/application.properties	18 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/prd/application.properties	4 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	4 ●●●●● patch \| view \| raw \| blame \| history