Ver código fonte

Merge branch 'master' of http://116.63.33.55/git/nazw

杨江 2 anos atrás
pai
commit
4af6dfdc6f
100 arquivos alterados com 2 adições e 2 exclusões
  1. 2 2
      nngkxxdp/src/main/resources/mapper/TjDao.xml
  2. BIN
      nngkxxdp/src/main/resources/static/district/image/adyey.webp
  3. BIN
      nngkxxdp/src/main/resources/static/district/image/alfyeycsq.webp
  4. BIN
      nngkxxdp/src/main/resources/static/district/image/alyey.webp
  5. BIN
      nngkxxdp/src/main/resources/static/district/image/bblyeyylz.webp
  6. BIN
      nngkxxdp/src/main/resources/static/district/image/besdyey.webp
  7. BIN
      nngkxxdp/src/main/resources/static/district/image/bjsy_1.jpg
  8. BIN
      nngkxxdp/src/main/resources/static/district/image/bjyey.webp
  9. BIN
      nngkxxdp/src/main/resources/static/district/image/blfyey.webp
  10. BIN
      nngkxxdp/src/main/resources/static/district/image/bmyey.webp
  11. BIN
      nngkxxdp/src/main/resources/static/district/image/bsyey.webp
  12. BIN
      nngkxxdp/src/main/resources/static/district/image/byddyey.webp
  13. BIN
      nngkxxdp/src/main/resources/static/district/image/byyey.png
  14. BIN
      nngkxxdp/src/main/resources/static/district/image/bzjyey.webp
  15. BIN
      nngkxxdp/src/main/resources/static/district/image/cefshsayey.webp
  16. BIN
      nngkxxdp/src/main/resources/static/district/image/cnjy.webp
  17. BIN
      nngkxxdp/src/main/resources/static/district/image/cqjtdx.webp
  18. BIN
      nngkxxdp/src/main/resources/static/district/image/cqjzgczyxy.webp
  19. BIN
      nngkxxdp/src/main/resources/static/district/image/cqnashyey.webp
  20. BIN
      nngkxxdp/src/main/resources/static/district/image/cqswzyxy.webp
  21. BIN
      nngkxxdp/src/main/resources/static/district/image/cqyddx.jpg
  22. BIN
      nngkxxdp/src/main/resources/static/district/image/csmxyey.webp
  23. BIN
      nngkxxdp/src/main/resources/static/district/image/csqzx.webp
  24. BIN
      nngkxxdp/src/main/resources/static/district/image/csyey.webp
  25. BIN
      nngkxxdp/src/main/resources/static/district/image/cxddyey.webp
  26. BIN
      nngkxxdp/src/main/resources/static/district/image/cyxccj.webp
  27. BIN
      nngkxxdp/src/main/resources/static/district/image/dbssz.webp
  28. BIN
      nngkxxdp/src/main/resources/static/district/image/descdx.webp
  29. BIN
      nngkxxdp/src/main/resources/static/district/image/dewgy.webp
  30. BIN
      nngkxxdp/src/main/resources/static/district/image/dssbz.webp
  31. BIN
      nngkxxdp/src/main/resources/static/district/image/dssjz.webp
  32. BIN
      nngkxxdp/src/main/resources/static/district/image/dsyzjk.webp
  33. BIN
      nngkxxdp/src/main/resources/static/district/image/dxp.jpg
  34. BIN
      nngkxxdp/src/main/resources/static/district/image/dyyl.webp
  35. BIN
      nngkxxdp/src/main/resources/static/district/image/dzs.jpg
  36. BIN
      nngkxxdp/src/main/resources/static/district/image/dzsjdzxyeyjdfl.jpg
  37. BIN
      nngkxxdp/src/main/resources/static/district/image/dzsyeycjh.webp
  38. BIN
      nngkxxdp/src/main/resources/static/district/image/dzszx.webp
  39. BIN
      nngkxxdp/src/main/resources/static/district/image/eflmjryey.webp
  40. BIN
      nngkxxdp/src/main/resources/static/district/image/frzx.webp
  41. BIN
      nngkxxdp/src/main/resources/static/district/image/ggtyey.webp
  42. BIN
      nngkxxdp/src/main/resources/static/district/image/glthyey.webp
  43. BIN
      nngkxxdp/src/main/resources/static/district/image/gsdx.webp
  44. BIN
      nngkxxdp/src/main/resources/static/district/image/gsdxyey.webp
  45. BIN
      nngkxxdp/src/main/resources/static/district/image/gtcjzx.webp
  46. BIN
      nngkxxdp/src/main/resources/static/district/image/gy.jpg
  47. BIN
      nngkxxdp/src/main/resources/static/district/image/gyzx.jpg
  48. BIN
      nngkxxdp/src/main/resources/static/district/image/hgyey.webp
  49. BIN
      nngkxxdp/src/main/resources/static/district/image/hhyey.webp
  50. BIN
      nngkxxdp/src/main/resources/static/district/image/hjs.jpg
  51. BIN
      nngkxxdp/src/main/resources/static/district/image/hjyxxxfsyey.webp
  52. BIN
      nngkxxdp/src/main/resources/static/district/image/hlyey.webp
  53. BIN
      nngkxxdp/src/main/resources/static/district/image/hpxxxfsyey.webp
  54. BIN
      nngkxxdp/src/main/resources/static/district/image/hu.jpg
  55. BIN
      nngkxxdp/src/main/resources/static/district/image/hylyxx.png
  56. BIN
      nngkxxdp/src/main/resources/static/district/image/hyyey.webp
  57. BIN
      nngkxxdp/src/main/resources/static/district/image/jcjzxwxxxfsyey.webp
  58. BIN
      nngkxxdp/src/main/resources/static/district/image/jdgcjgxx.webp
  59. BIN
      nngkxxdp/src/main/resources/static/district/image/jdkyey.webp
  60. BIN
      nngkxxdp/src/main/resources/static/district/image/jfhnbyyyey.webp
  61. BIN
      nngkxxdp/src/main/resources/static/district/image/jfhyey.webp
  62. BIN
      nngkxxdp/src/main/resources/static/district/image/jgsysyey.webp
  63. BIN
      nngkxxdp/src/main/resources/static/district/image/jgwyey.webp
  64. BIN
      nngkxxdp/src/main/resources/static/district/image/jgyyey.webp
  65. BIN
      nngkxxdp/src/main/resources/static/district/image/jhtyey.jpg
  66. BIN
      nngkxxdp/src/main/resources/static/district/image/jkybssy_1.webp
  67. BIN
      nngkxxdp/src/main/resources/static/district/image/jkybssyxxyey.jpeg
  68. BIN
      nngkxxdp/src/main/resources/static/district/image/jmgtmyey.jpg
  69. BIN
      nngkxxdp/src/main/resources/static/district/image/jn.jpg
  70. BIN
      nngkxxdp/src/main/resources/static/district/image/jnftyey.webp
  71. BIN
      nngkxxdp/src/main/resources/static/district/image/jnys.webp
  72. BIN
      nngkxxdp/src/main/resources/static/district/image/jpgyey.webp
  73. BIN
      nngkxxdp/src/main/resources/static/district/image/jsl.webp
  74. BIN
      nngkxxdp/src/main/resources/static/district/image/jstnyey.webp
  75. BIN
      nngkxxdp/src/main/resources/static/district/image/jtdxyey.webp
  76. BIN
      nngkxxdp/src/main/resources/static/district/image/kdldyfyey.webp
  77. BIN
      nngkxxdp/src/main/resources/static/district/image/lbcyey.webp
  78. BIN
      nngkxxdp/src/main/resources/static/district/image/ldfcyey.webp
  79. BIN
      nngkxxdp/src/main/resources/static/district/image/ldwgcyey.webp
  80. BIN
      nngkxxdp/src/main/resources/static/district/image/lgyey.webp
  81. BIN
      nngkxxdp/src/main/resources/static/district/image/llyey.webp
  82. BIN
      nngkxxdp/src/main/resources/static/district/image/lmhp.webp
  83. BIN
      nngkxxdp/src/main/resources/static/district/image/lmhzyzxx.webp
  84. BIN
      nngkxxdp/src/main/resources/static/district/image/mmjnyey.webp
  85. BIN
      nngkxxdp/src/main/resources/static/district/image/nashyey.webp
  86. BIN
      nngkxxdp/src/main/resources/static/district/image/nassyey.png
  87. BIN
      nngkxxdp/src/main/resources/static/district/image/nkrqzx.webp
  88. BIN
      nngkxxdp/src/main/resources/static/district/image/np.webp
  89. BIN
      nngkxxdp/src/main/resources/static/district/image/npcjsy_1.jpg
  90. BIN
      nngkxxdp/src/main/resources/static/district/image/npsh.webp
  91. BIN
      nngkxxdp/src/main/resources/static/district/image/npsy.jpg
  92. BIN
      nngkxxdp/src/main/resources/static/district/image/npsyjkxxxfsyeb.webp
  93. BIN
      nngkxxdp/src/main/resources/static/district/image/npsyyey.webp
  94. BIN
      nngkxxdp/src/main/resources/static/district/image/npzzxyey.jpg
  95. BIN
      nngkxxdp/src/main/resources/static/district/image/nsshsyxxxfsyey.webp
  96. BIN
      nngkxxdp/src/main/resources/static/district/image/nwyjnsayey.webp
  97. BIN
      nngkxxdp/src/main/resources/static/district/image/nwyyey.webp
  98. BIN
      nngkxxdp/src/main/resources/static/district/image/phsyyey.webp
  99. BIN
      nngkxxdp/src/main/resources/static/district/image/plyeytszzxy.webp
  100. BIN
      nngkxxdp/src/main/resources/static/district/image/qcyghlwyey.webp

+ 2 - 2
nngkxxdp/src/main/resources/mapper/TjDao.xml

@@ -192,8 +192,8 @@
 	<!-- 查询扣分详情 -->
 	<select id="getEventByDeptId" resultType="java.util.Map">
 		SELECT
-# 			tp.target,
-		    tr.cloumn_name target,
+			tp.target,
+		    tr.cloumn_name,
 			tp.target_score,
 			tp.target_requirement,
 			tp.target_deduct,

BIN
nngkxxdp/src/main/resources/static/district/image/adyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/alfyeycsq.webp


BIN
nngkxxdp/src/main/resources/static/district/image/alyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/bblyeyylz.webp


BIN
nngkxxdp/src/main/resources/static/district/image/besdyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/bjsy_1.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/bjyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/blfyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/bmyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/bsyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/byddyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/byyey.png


BIN
nngkxxdp/src/main/resources/static/district/image/bzjyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cefshsayey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cnjy.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cqjtdx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cqjzgczyxy.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cqnashyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cqswzyxy.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cqyddx.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/csmxyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/csqzx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/csyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cxddyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/cyxccj.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dbssz.webp


BIN
nngkxxdp/src/main/resources/static/district/image/descdx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dewgy.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dssbz.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dssjz.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dsyzjk.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dxp.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/dyyl.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dzs.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/dzsjdzxyeyjdfl.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/dzsyeycjh.webp


BIN
nngkxxdp/src/main/resources/static/district/image/dzszx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/eflmjryey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/frzx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/ggtyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/glthyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/gsdx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/gsdxyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/gtcjzx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/gy.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/gyzx.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/hgyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/hhyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/hjs.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/hjyxxxfsyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/hlyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/hpxxxfsyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/hu.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/hylyxx.png


BIN
nngkxxdp/src/main/resources/static/district/image/hyyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jcjzxwxxxfsyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jdgcjgxx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jdkyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jfhnbyyyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jfhyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jgsysyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jgwyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jgyyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jhtyey.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/jkybssy_1.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jkybssyxxyey.jpeg


BIN
nngkxxdp/src/main/resources/static/district/image/jmgtmyey.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/jn.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/jnftyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jnys.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jpgyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jsl.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jstnyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/jtdxyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/kdldyfyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/lbcyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/ldfcyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/ldwgcyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/lgyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/llyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/lmhp.webp


BIN
nngkxxdp/src/main/resources/static/district/image/lmhzyzxx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/mmjnyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/nashyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/nassyey.png


BIN
nngkxxdp/src/main/resources/static/district/image/nkrqzx.webp


BIN
nngkxxdp/src/main/resources/static/district/image/np.webp


BIN
nngkxxdp/src/main/resources/static/district/image/npcjsy_1.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/npsh.webp


BIN
nngkxxdp/src/main/resources/static/district/image/npsy.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/npsyjkxxxfsyeb.webp


BIN
nngkxxdp/src/main/resources/static/district/image/npsyyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/npzzxyey.jpg


BIN
nngkxxdp/src/main/resources/static/district/image/nsshsyxxxfsyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/nwyjnsayey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/nwyyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/phsyyey.webp


BIN
nngkxxdp/src/main/resources/static/district/image/plyeytszzxy.webp


BIN
nngkxxdp/src/main/resources/static/district/image/qcyghlwyey.webp


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff