Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataPriceMapper.xml

@@ -188,6 +188,13 @@
         where t.is_deleted = 0
         and t.client_id = #{basicdataPrice.clientId}
         and t.brand_id = #{basicdataPrice.brandId}
+        ORDER BY
+        CASE
+        WHEN t.effective_status = 0 THEN 1
+        WHEN t.effective_status = -1 THEN 2
+        WHEN t.effective_status = 1 THEN 3
+        ELSE 4
+        END
     </select>
 
     <select id="selectBasicdataPricePageV2Export" resultType="com.logpm.basicdata.vo.BasicdataPricePageV2VO">

blade-service/logpm-factory-data/logpm-factory-data-jinpai/src/main/java/com/logpm/factorydata/jinpai/enums/WarehouseEnums.java

@@ -23,6 +23,7 @@ public enum WarehouseEnums implements IDict<String> {
 	WU_HAN("898F1156FADF8AE5E61C76F07187426A", "武汉仓"),
 	XI_AN("80F42D9EAE8851C057F275D05E4B987D", "西安仓"),
 	GUANG_YUAN("9D5F309EFB333FF88230AEC95302E051", "广元仓"),
+	SHUANG_LIU("95237BF269AF3DC9EFC73B68498C37DD", "双流金牌基地仓"),
 	;
 
 	WarehouseEnums(String code, String text) {